diff options
| author | Jesús Espino <jespinog@gmail.com> | 2018-05-29 16:58:12 +0200 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-05-29 15:58:12 +0100 |
| commit | e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8 (patch) | |
| tree | 480a5b91b37e2728ea151e3b7ad521aaf4402697 /i18n | |
| parent | bf4cefc3496686850757b2d44219ea2425871dda (diff) | |
| download | chat-e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8.tar.gz chat-e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8.tar.bz2 chat-e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8.zip | |
MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)
* MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions
* MM-8853: Removing unnecesary emoji enterprise feature
* Create emojis migration
* Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS always to system admins
* Simplifing permissions checks
* Revert "Simplifing permissions checks"
This reverts commit e2cafc1905fc9e20125dd9a1552d2d0c7340ae59.
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 d631e7e1d..0fc9a733f 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1337,10 +1337,6 @@ "translation": "Unable to delete reactions when deleting emoji with emoji name %v" }, { - "id": "api.emoji.delete.permissions.app_error", - "translation": "Invalid permissions to delete emoji." - }, - { "id": "api.emoji.disabled.app_error", "translation": "Custom emoji have been disabled by the system admin." }, |