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

..

async_client.jsx

Added channel id to updateLastViewed api calls to prevent multiple updates to different channels from clashing

2015-09-30 09:59:59 -04:00

client.jsx

Merge pull request #881 from hmhealey/plt194

2015-10-02 08:45:38 -04:00

constants.jsx

pot-375 - Making modals compatible with themes

2015-10-01 09:33:21 +05:00

emoticons.jsx

Removed smilies that start with a semicolon

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

markdown.jsx

Merge pull request #769 from hmhealey/plt334

2015-09-24 08:14:25 -04:00

text_formatting.jsx

Added emailto: to the beginning of email links

2015-10-02 09:18:45 -04:00

utils.jsx

pot-375 - Making modals compatible with themes

2015-10-01 09:33:21 +05:00