summaryrefslogtreecommitdiffstats
path: root/web/react/pages/verify.jsx
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-08-21 18:17:24 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-08-21 18:17:24 +0500
commit299bf056a584dd71cf0285b6ef1bbd596c07c0fe (patch)
treec1f32092efa1294c0a75d1e2f23154605ec8d001 /web/react/pages/verify.jsx
parentafb09a1b9dd83e480a8c4f5744bd79cafb88a682 (diff)
parent4a022752faf9a2b6c4de5cfa65f23adb578a96a5 (diff)
downloadchat-299bf056a584dd71cf0285b6ef1bbd596c07c0fe.tar.gz
chat-299bf056a584dd71cf0285b6ef1bbd596c07c0fe.tar.bz2
chat-299bf056a584dd71cf0285b6ef1bbd596c07c0fe.zip
Merge branch 'master' of https://github.com/mattermost/platform into mm-1696
Conflicts: web/react/components/setting_upload.jsx web/react/components/team_import_tab.jsx
Diffstat (limited to 'web/react/pages/verify.jsx')
0 files changed, 0 insertions, 0 deletions