Christopher Speller 67db3ca8ce Merge pull request #1745 from mattermost/plt-1118 ...

PLT-1118 Add ability to switch between SSO and email account

2016-01-04 15:55:51 -05:00

..

components

Merge pull request #1745 from mattermost/plt-1118

2016-01-04 15:55:51 -05:00

dispatcher

Merge branch 'release-1.3'

2015-12-14 19:01:22 -05:00

pages

Add ability to switch between SSO and email account

2015-12-17 12:44:46 -05:00

stores

Refactored ViewImage modal and made it automatically play animated gifs

2015-12-18 12:51:04 -05:00

utils

Merge pull request #1745 from mattermost/plt-1118

2016-01-04 15:55:51 -05:00

.eslintrc

Added -1 as an ignored magic number

2015-12-01 16:25:58 -05:00

package.json

Switched marked to mattermost/marked

2015-12-07 14:24:46 -05:00