summaryrefslogtreecommitdiffstats
path: root/web/react/components/setting_upload.jsx
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/mattermost/platform into mm-1696Asaad Mahmood2015-08-211-0/+12
|\
| * Fixing typo "SelectFile" -> "Select File"it332015-08-201-1/+1
* | MM-1696 - Improvements for Slack ImportAsaad Mahmood2015-08-211-5/+23
|/
* Implemention of slack import feature.Christopher Speller2015-08-191-0/+79