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/i18n | |
| 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/i18n')
| -rw-r--r-- | webapp/i18n/en.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 1636a3576..952b90543 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -477,7 +477,7 @@ "admin.oauth.gitlab": "GitLab", "admin.oauth.google": "Google Apps", "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider", - "admin.oauth.office365": "Office 365", + "admin.oauth.office365": "Office 365 (Beta)", "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications.", "admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ", "admin.oauth.select": "Select OAuth 2.0 service provider:", |