Merge branch 'master' of https://github.com/mattermost/platform into plt-375

Conflicts:
	web/react/components/user_settings/user_settings_appearance.jsx

1 files changed, 7 insertions, 8 deletions

diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx
index e9ca0f4a5..c4a137ed8 100644
--- a/web/react/components/user_settings/user_settings_appearance.jsx
+++ b/web/react/components/user_settings/user_settings_appearance.jsx
@@ -214,15 +214,14 @@ export default class UserSettingsAppearance extends React.Component {
                     <div className='divider-dark first'/>
                     {themeUI}
                     <div className='divider-dark'/>
-                    <br/>
-                    <a
-                        href='#'
-                        className='theme'
-                        onClick={this.handleImportModal}
-                    >
-                        {'Import from Slack'}
-                    </a>
                 </div>
+                <br/>
+                <a
+                    className='theme'
+                    onClick={this.handleImportModal}
+                >
+                    {'Import theme colors from Slack'}
+                </a>
             </div>
         );
     }