| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Updating setting_upload | Asaad Mahmood | 2015-08-21 | 1 | -12/+0 |
| | | |||||
| * | Merge branch 'master' of https://github.com/mattermost/platform into mm-1696 | Asaad Mahmood | 2015-08-21 | 1 | -0/+12 |
| |\ | | | | | | | | | | | Conflicts: web/react/components/setting_upload.jsx web/react/components/team_import_tab.jsx | ||||
| | * | Fixing typo "SelectFile" -> "Select File" | it33 | 2015-08-20 | 1 | -1/+1 |
| | | | |||||
| * | | MM-1696 - Improvements for Slack Import | Asaad Mahmood | 2015-08-21 | 1 | -5/+23 |
| |/ | |||||
| * | Implemention of slack import feature. | Christopher Speller | 2015-08-19 | 1 | -0/+79 |
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |