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

..

react

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

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

sass-files

pot-375 - Making modals compatible with themes

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

static

pot-375 - Making modals compatible with themes

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

templates

PLT-345 adding client side logging

2015-09-29 15:55:19 -07:00

web_test.go

Fixing merge conflict

2015-09-22 13:18:42 -07:00

web.go

Update incoming webhooks to hide DMs and accept direct JSON payloads.

2015-09-29 08:38:26 -04:00