diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-02 09:33:28 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-02 09:33:28 -0400 |
| commit | 5a31c950b0aa57a2b98c91da740269539f437e04 (patch) | |
| tree | e20601369fc294fddbfdbd658a950905adb235b9 /web | |
| parent | b07fad563d41ad44cae421b2e2f9d200ad3a5744 (diff) | |
| parent | 95fe16e0d90e0dfbcf5b6377903a20abff39d4f5 (diff) | |
| download | chat-5a31c950b0aa57a2b98c91da740269539f437e04.tar.gz chat-5a31c950b0aa57a2b98c91da740269539f437e04.tar.bz2 chat-5a31c950b0aa57a2b98c91da740269539f437e04.zip | |
Merge pull request #913 from mattermost/it33-patch-3
Change text to avoid confusion with Slack Import
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/user_settings/user_settings_appearance.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx index 4372069e7..c4a137ed8 100644 --- a/web/react/components/user_settings/user_settings_appearance.jsx +++ b/web/react/components/user_settings/user_settings_appearance.jsx @@ -220,7 +220,7 @@ export default class UserSettingsAppearance extends React.Component { className='theme' onClick={this.handleImportModal} > - {'Import from Slack'} + {'Import theme colors from Slack'} </a> </div> ); |