summaryrefslogtreecommitdiffstats
path: root/web/react/components/team_import_tab.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-09-14 12:04:57 -0400
committerChristopher Speller <crspeller@gmail.com>2015-09-14 12:18:38 -0400
commit7b3c2d6d85ecee86fbc85b440e7028018b1090b1 (patch)
tree2493b0f770c931cedde57f8d787f37f6631de484 /web/react/components/team_import_tab.jsx
parentb2378f433ecd44a9811a52bd58e36a40f92e193f (diff)
downloadchat-7b3c2d6d85ecee86fbc85b440e7028018b1090b1.tar.gz
chat-7b3c2d6d85ecee86fbc85b440e7028018b1090b1.tar.bz2
chat-7b3c2d6d85ecee86fbc85b440e7028018b1090b1.zip
Allowing underscores in channel names. Added conversion of some slack channel names into valid mattermost 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>
);