diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2016-08-10 14:24:16 -0500 |
|---|---|---|
| committer | Elias Nahum <nahumhbl@gmail.com> | 2016-08-10 14:24:16 -0500 |
| commit | 8d5aa69950032777ea7286329d920de36aaa8a73 (patch) | |
| tree | 8a4e32401d3bc9615221ab5a31015bff842be715 /webapp/components/admin_console/oauth_settings.jsx | |
| parent | 805659239098a0b382a2a8bad704c2e91ab38ed6 (diff) | |
| parent | bd106bb4018ab71dc1bc973d562bcda3dfbb6868 (diff) | |
| download | chat-8d5aa69950032777ea7286329d920de36aaa8a73.tar.gz chat-8d5aa69950032777ea7286329d920de36aaa8a73.tar.bz2 chat-8d5aa69950032777ea7286329d920de36aaa8a73.zip | |
Merge branch 'release-3.3' RC4
Diffstat (limited to 'webapp/components/admin_console/oauth_settings.jsx')
| -rw-r--r-- | webapp/components/admin_console/oauth_settings.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/admin_console/oauth_settings.jsx b/webapp/components/admin_console/oauth_settings.jsx index 92663ece8..1f377bcc3 100644 --- a/webapp/components/admin_console/oauth_settings.jsx +++ b/webapp/components/admin_console/oauth_settings.jsx @@ -406,7 +406,7 @@ export default class OAuthSettings extends AdminSettings { oauthTypes.push({value: Constants.GOOGLE_SERVICE, text: Utils.localizeMessage('admin.oauth.google', 'Google Apps')}); } if (global.window.mm_license.Office365SSO === 'true') { - oauthTypes.push({value: Constants.OFFICE365_SERVICE, text: Utils.localizeMessage('admin.oauth.office365', 'Office 365')}); + oauthTypes.push({value: Constants.OFFICE365_SERVICE, text: Utils.localizeMessage('admin.oauth.office365', 'Office 365 (Beta)')}); } } |