diff options
| author | Martin Kraft <mkraft@users.noreply.github.com> | 2018-05-22 14:15:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 14:15:54 -0400 |
| commit | f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab (patch) | |
| tree | 85d274cb7ecca9ea6e8e595b15aa631c54acf1ea /i18n | |
| parent | 4c683aff7627040ff811f065848a820b2cb19d59 (diff) | |
| parent | ce378adc97399dcae9e1c9621c584669b813b2d2 (diff) | |
| download | chat-f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab.tar.gz chat-f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab.tar.bz2 chat-f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab.zip | |
Merge branch 'master' into advanced-permissions-phase-2
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 88bbcb9f1..59a600f23 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -6887,6 +6887,10 @@ "translation": "Unable to get roles" }, { + "id": "web.incoming_webhook.channel_locked.app_error", + "translation": "This webhook is not permitted to post to the requested channel" + }, + { "id": "store.sql_role.permanent_delete_all.app_error", "translation": "We could not permanently delete all the roles" }, |