diff options
| author | cpanato <ctadeu@gmail.com> | 2018-06-15 17:38:08 +0200 |
|---|---|---|
| committer | cpanato <ctadeu@gmail.com> | 2018-06-15 17:38:08 +0200 |
| commit | e38b18565ecd9dbe46b0ba8a263c7a39caa0bfda (patch) | |
| tree | 3df8e817eafd710bbc3b5ef04ea42c3d2581c74f /i18n | |
| parent | c8b99b97dffbc7c96b3911f6301f0ec69399cea2 (diff) | |
| parent | 85a75526c7c03fca1d14a39cfb3f2638d98d3fe1 (diff) | |
| download | chat-e38b18565ecd9dbe46b0ba8a263c7a39caa0bfda.tar.gz chat-e38b18565ecd9dbe46b0ba8a263c7a39caa0bfda.tar.bz2 chat-e38b18565ecd9dbe46b0ba8a263c7a39caa0bfda.zip | |
Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to-master-20180615
Diffstat (limited to 'i18n')
| -rw-r--r-- | i18n/en.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json index 2f7aa47fc..843f9b807 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2827,6 +2827,10 @@ "translation": "Blank email" }, { + "id": "oauth.gitlab.tos.error", + "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again." + }, + { "id": "api.user.complete_switch_with_oauth.parse.app_error", "translation": "Could not parse auth data out of {{.Service}} user object" }, |