Asaad Mahmood d8c5c4f746 Merge branch 'master' of https://github.com/mattermost/platform into plt-375 ...

Conflicts:
	web/react/components/user_settings/user_settings_appearance.jsx

2015-10-02 22:26:28 +05:00

..

components

Merge branch 'master' of https://github.com/mattermost/platform into plt-375

2015-10-02 22:26:28 +05:00

dispatcher

Cosmetic reformatting of multiple jsx files

2015-09-02 08:30:23 -07:00

pages

Fixing blue bar and renders warning when mis-configured.

2015-09-24 15:06:54 -07:00

stores

Fixing blue bar and renders warning when mis-configured.

2015-09-24 15:06:54 -07:00

utils

Merge branch 'master' of https://github.com/mattermost/platform into plt-375

2015-10-02 22:26:28 +05:00

.eslintrc

New add channel modal using react-bootstrap.

2015-09-14 13:56:58 -04:00

package.json

Implement UI theme colors.

2015-09-23 10:12:40 -04:00