Asaad Mahmood 299bf056a5 Merge branch 'master' of https://github.com/mattermost/platform into mm-1696 ...

Conflicts:
	web/react/components/setting_upload.jsx
	web/react/components/team_import_tab.jsx

2015-08-21 18:17:24 +05:00

..

react

Merge branch 'master' of https://github.com/mattermost/platform into mm-1696

2015-08-21 18:17:24 +05:00

sass-files

Merge branch 'master' of https://github.com/mattermost/platform into mm-1696

2015-08-21 18:17:24 +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