diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-04-01 08:46:03 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-04-01 08:46:03 -0400 |
| commit | 3aa240d74fe4137fcb0fa8038ede241a4e03b805 (patch) | |
| tree | 1d775d212777dc9b7e995670a2014af4604ae08b /webapp/components/user_settings/user_settings_security.jsx | |
| parent | da5de9eed36f2dde768398dc30c95a58e80f7b19 (diff) | |
| parent | 271876f3b53225611dfee40fd46917c6a477314b (diff) | |
| download | chat-3aa240d74fe4137fcb0fa8038ede241a4e03b805.tar.gz chat-3aa240d74fe4137fcb0fa8038ede241a4e03b805.tar.bz2 chat-3aa240d74fe4137fcb0fa8038ede241a4e03b805.zip | |
Merge pull request #2599 from ZBoxApp/locs
Add missing en locs and translations to es
Diffstat (limited to 'webapp/components/user_settings/user_settings_security.jsx')
| -rw-r--r-- | webapp/components/user_settings/user_settings_security.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index e4044e6d0..ff5a898a9 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -1,6 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. +import $ from 'jquery'; import SettingItemMin from '../setting_item_min.jsx'; import SettingItemMax from '../setting_item_max.jsx'; import AccessHistoryModal from '../access_history_modal.jsx'; @@ -247,7 +248,7 @@ class SecurityTab extends React.Component { extraInfo = ( <span> <FormattedMessage - id='user.settings.mfa.addHelp' + id='user.settings.mfa.addHelpQr' defaultMessage='Please scan the QR code with the Google Authenticator app on your smartphone and fill in the token with one provided by the app.' /> </span> |