=Corey Hulen ccf2e6e4e7 Changing image settings to file settings

2015-09-23 13:47:10 -07:00

..

react

Changing image settings to file settings

2015-09-23 13:47:10 -07:00

sass-files

Merge pull request #759 from mattermost/plt-242-3

2015-09-23 15:04:22 -04:00

static

Merge pull request #759 from mattermost/plt-242-3

2015-09-23 15:04:22 -04:00

templates

Merge branch 'master' into PLT-11-email

2015-09-23 12:55:58 -07:00

web_test.go

Fixing merge conflict

2015-09-22 13:18:42 -07:00

web.go

Merge branch 'master' into PLT-11-email

2015-09-23 12:55:58 -07:00