From 59afe8bdf8efb93e607ca1a0449e6932f0c03233 Mon Sep 17 00:00:00 2001
From: mishimi <michelle@spinpunch.com>
Date: Thu, 24 Sep 2015 04:07:49 -0700
Subject: PLT-388

Warning users that  @mentions from Slack are currently not supported after import
---
 web/react/components/team_import_tab.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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>
         );
 
-- 
cgit v1.2.3-1-g7c22