summaryrefslogtreecommitdiffstats
path: root/web/react/components/team_import_tab.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-09-14 14:32:15 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-09-14 14:32:15 -0400
commit125b7dc71bb3ef00dc038632bf71737e5d25158b (patch)
treebea7dc36e248391ceba9323f07c9d516c7b5af1a /web/react/components/team_import_tab.jsx
parent0d8e27ce94c53b628109cc6ad11feeb2a1e4de88 (diff)
parent7b3c2d6d85ecee86fbc85b440e7028018b1090b1 (diff)
downloadchat-125b7dc71bb3ef00dc038632bf71737e5d25158b.tar.gz
chat-125b7dc71bb3ef00dc038632bf71737e5d25158b.tar.bz2
chat-125b7dc71bb3ef00dc038632bf71737e5d25158b.zip
Merge pull request #677 from mattermost/plt-50
PLT-50 Allowing channel names with underscores. Allow import of more slack channel names.
Diffstat (limited to 'web/react/components/team_import_tab.jsx')
-rw-r--r--web/react/components/team_import_tab.jsx2
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>
);