diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-14 16:59:24 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-14 16:59:24 -0700 |
| commit | 3bd350dcaf65a89040f7ea395a19b620819ba03e (patch) | |
| tree | 72b49e6fadfc1d513489b8938d5f73620ff2a6d8 /web/react/components/team_import_tab.jsx | |
| parent | e06e292be71ca699d90bafbd635118aa47c2d7a5 (diff) | |
| parent | bfebb41bc0c0a1c5f481617f912bdf6dd483c341 (diff) | |
| download | chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.gz chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.bz2 chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.zip | |
Merge branch 'master' into PLT-12-log
Diffstat (limited to 'web/react/components/team_import_tab.jsx')
| -rw-r--r-- | web/react/components/team_import_tab.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/team_import_tab.jsx b/web/react/components/team_import_tab.jsx index 031abc36a..8315430e4 100644 --- a/web/react/components/team_import_tab.jsx +++ b/web/react/components/team_import_tab.jsx @@ -35,7 +35,7 @@ export default class TeamImportTab extends React.Component { var uploadHelpText = ( <div> <p>{'Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team\'\s public channels.'}</p> - <p>{'The Slack import to Mattermost is in "Preview". Slack bot posts and channels with underscores do not yet import.'}</p> + <p>{'The Slack import to Mattermost is in "Preview". Slack bot posts do not yet import.'}</p> </div> ); |