Asaad Mahmood da97cecd25 Merge branch 'master' of https://github.com/mattermost/platform into ui-changes ...

Conflicts:
	web/react/components/channel_notifications.jsx

2015-08-21 15:42:11 +05:00

..

react

Merge branch 'master' of https://github.com/mattermost/platform into ui-changes

2015-08-21 15:42:11 +05:00

sass-files

Multiple UI Improvements

2015-08-21 15:41:10 +05:00

static

Merge pull request #381 from mattermost/mm-1705

2015-08-18 08:47:35 -04:00

templates

Cosmetic refactoring for ESLint

2015-08-19 08:53:52 -04:00

web_test.go

first commit

2015-06-14 23:53:32 -08:00

web.go

added google sign-in functionality to the client, with minor model modifications

2015-08-14 12:38:16 -04:00