diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-05-15 07:45:28 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-15 07:45:28 -0400 |
commit | f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7 (patch) | |
tree | d3899b890408f6f16b2d5f543bf975475f1a5584 /i18n | |
parent | 51bd710ecdca6628461c9fa2679737073e4d5059 (diff) | |
parent | a1656dffa98fbc8865e476b214e4e0c562547d39 (diff) | |
download | chat-f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7.tar.gz chat-f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7.tar.bz2 chat-f82cc7896dd57c4c96471bcbbd2b1a39f908e5e7.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'i18n')
-rw-r--r-- | i18n/en.json | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/i18n/en.json b/i18n/en.json index 0b954d814..6666f8503 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5983,10 +5983,6 @@ "translation": "We couldn't delete the channel" }, { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "Problem updating members last updated time" - }, - { "id": "store.sql_channel.get.existing.app_error", "translation": "We couldn't find the existing channel" }, |