summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2015-09-24 09:09:53 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2015-09-24 09:09:53 -0400
commit90d1f4c6a130deeb7685b86bcce44472f9c7ece5 (patch)
tree555160a76bf47a4baf8a5ae3fb0ad178a803153e
parent54c7dba33dc707fa7013a87040c8a8e5d7b237e9 (diff)
parent59afe8bdf8efb93e607ca1a0449e6932f0c03233 (diff)
downloadchat-90d1f4c6a130deeb7685b86bcce44472f9c7ece5.tar.gz
chat-90d1f4c6a130deeb7685b86bcce44472f9c7ece5.tar.bz2
chat-90d1f4c6a130deeb7685b86bcce44472f9c7ece5.zip
Merge pull request #776 from mishimi/patch-5
PLT-388 Added warning that @mentions from Slack are not imported
-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 8315430e4..79f03510f 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 do not yet import.'}</p>
+ <p>{'The Slack import to Mattermost is in "Preview". Slack bot posts do not yet import and Slack @mentions are not currently supported.'}</p>
</div>
);