diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-10-03 16:03:15 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-03 16:03:15 -0400 |
commit | 8f91c777559748fa6e857d9fc1f4ae079a532813 (patch) | |
tree | 190f7cef373764a0d47a91045fdb486ee3d6781d /webapp/components/admin_console/email_settings.jsx | |
parent | 5f8e5c401bd96cba9a98b2db02d72f9cbacb0103 (diff) | |
download | chat-8f91c777559748fa6e857d9fc1f4ae079a532813.tar.gz chat-8f91c777559748fa6e857d9fc1f4ae079a532813.tar.bz2 chat-8f91c777559748fa6e857d9fc1f4ae079a532813.zip |
Adding ability to serve TLS directly from Mattermost server (#4119)
Diffstat (limited to 'webapp/components/admin_console/email_settings.jsx')
-rw-r--r-- | webapp/components/admin_console/email_settings.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/email_settings.jsx b/webapp/components/admin_console/email_settings.jsx index b05a3f905..d62c5ad4c 100644 --- a/webapp/components/admin_console/email_settings.jsx +++ b/webapp/components/admin_console/email_settings.jsx @@ -7,7 +7,7 @@ import * as Utils from 'utils/utils.jsx'; import AdminSettings from './admin_settings.jsx'; import BooleanSetting from './boolean_setting.jsx'; -import ConnectionSecurityDropdownSetting from './connection_security_dropdown_setting.jsx'; +import {ConnectionSecurityDropdownSettingEmail} from './connection_security_dropdown_setting.jsx'; import EmailConnectionTest from './email_connection_test.jsx'; import {FormattedHTMLMessage, FormattedMessage} from 'react-intl'; import SettingsGroup from './settings_group.jsx'; @@ -266,7 +266,7 @@ export default class EmailSettings extends AdminSettings { onChange={this.handleChange} disabled={!this.state.sendEmailNotifications} /> - <ConnectionSecurityDropdownSetting + <ConnectionSecurityDropdownSettingEmail value={this.state.connectionSecurity} onChange={this.handleChange} disabled={!this.state.sendEmailNotifications} |