From e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 29 May 2018 16:58:12 +0200 Subject: 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. --- i18n/en.json | 4 ---- 1 file changed, 4 deletions(-) (limited to 'i18n') diff --git a/i18n/en.json b/i18n/en.json index d631e7e1d..0fc9a733f 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1336,10 +1336,6 @@ "id": "api.emoji.delete.delete_reactions.app_error", "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." -- cgit v1.2.3-1-g7c22