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

..

components

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

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

dispatcher

first commit

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

pages

Merge pull request #381 from mattermost/mm-1705

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

stores

Update etag version for the addition of CreatorId field to channels

2015-08-20 09:55:14 -04:00

utils

Fixing AM-PM issue

2015-08-20 12:59:07 -04:00

.eslintrc

Updating dependencies and blacklisting strict from babelify for now.

2015-08-18 15:55:44 -04:00

package.json

Updating dependencies and blacklisting strict from babelify for now.

2015-08-18 15:55:44 -04:00