IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,727 Commits 845 Branches 1,202 Tags
06b2adbcf40e8af49307bf0616888e48c638cc59
Commit Graph

5 Commits

Author SHA1 Message Date
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