summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorDavid Lu <david.lu@hotmail.com>2016-07-20 17:04:49 -0400
committerCorey Hulen <corey@hulen.com>2016-07-20 13:04:49 -0800
commit26b588c3f7ed509d33d95612d4f09b369ef14b48 (patch)
tree56caefcceb6989981cbcb44e2c6ffac027d78283 /webapp
parent0c977e8881e28768c1c046f1202663488a018b6a (diff)
downloadchat-26b588c3f7ed509d33d95612d4f09b369ef14b48.tar.gz
chat-26b588c3f7ed509d33d95612d4f09b369ef14b48.tar.bz2
chat-26b588c3f7ed509d33d95612d4f09b369ef14b48.zip
Added HTML formatting to Storage Settings (#3648)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/storage_settings.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/storage_settings.jsx b/webapp/components/admin_console/storage_settings.jsx
index f58541f02..3ebdfde8c 100644
--- a/webapp/components/admin_console/storage_settings.jsx
+++ b/webapp/components/admin_console/storage_settings.jsx
@@ -7,7 +7,7 @@ import * as Utils from 'utils/utils.jsx';
import AdminSettings from './admin_settings.jsx';
import DropdownSetting from './dropdown_setting.jsx';
-import {FormattedMessage} from 'react-intl';
+import {FormattedMessage, FormattedHTMLMessage} from 'react-intl';
import SettingsGroup from './settings_group.jsx';
import TextSetting from './text_setting.jsx';
@@ -74,7 +74,7 @@ export default class StorageSettings extends AdminSettings {
/>
}
helpText={
- <FormattedMessage
+ <FormattedHTMLMessage
id='admin.image.storeDescription'
defaultMessage='Storage system where files and image attachments are saved.<br /><br />
Selecting "Amazon S3" enables fields to enter your Amazon credentials and bucket details.<br /><br />