Christopher Speller
|
1ed6718dd9
|
Improvements to import UI
|
2015-08-26 15:24:17 -04:00 |
|
Asaad Mahmood
|
06b2adbcf4
|
Updating setting_upload
|
2015-08-21 18:21:04 +05:00 |
|
Asaad Mahmood
|
299bf056a5
|
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
|
2015-08-21 18:17:24 +05:00 |
|
Asaad Mahmood
|
afb09a1b9d
|
MM-1696 - Improvements for Slack Import
|
2015-08-21 18:15:02 +05:00 |
|
it33
|
f23f377612
|
Fixing typo "SelectFile" -> "Select File"
|
2015-08-20 23:20:42 -07:00 |
|
Christopher Speller
|
d78ebab108
|
Implemention of slack import feature.
|
2015-08-19 08:52:49 -04:00 |
|