summaryrefslogtreecommitdiffstats
path: root/doc/help
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-10-02 22:26:28 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-10-02 22:26:28 +0500
commitd8c5c4f7468bb07d8de904437726557c6fa9b436 (patch)
treec19af28e1ad6c2bf068bf64956461c25502f9bb3 /doc/help
parent813792dd600f4e485d52cc1066a8c1297578432d (diff)
parent41069d83d2b6ad5cca599f75292027e13d5b10f7 (diff)
downloadchat-d8c5c4f7468bb07d8de904437726557c6fa9b436.tar.gz
chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.tar.bz2
chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.zip
Merge branch 'master' of https://github.com/mattermost/platform into plt-375
Conflicts: web/react/components/user_settings/user_settings_appearance.jsx
Diffstat (limited to 'doc/help')
0 files changed, 0 insertions, 0 deletions