From 279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Thu, 6 Jul 2017 08:48:34 +0800
Subject: [PLT-6969] System console setting for the emoji picker (#6809)

* system console setting for the emoji picker

* remove state.emojiPickerEnable

* update url to /admin_console/customization/emoji
---
 config/config.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/config.json b/config/config.json
index 5a3aa03b3..eea6b6851 100644
--- a/config/config.json
+++ b/config/config.json
@@ -38,6 +38,7 @@
         "WebsocketPort": 80,
         "WebserverMode": "gzip",
         "EnableCustomEmoji": false,
+        "EnableEmojiPicker": false,
         "RestrictCustomEmojiCreation": "all",
         "RestrictPostDelete": "all",
         "AllowEditPost": "always",
-- 
cgit v1.2.3-1-g7c22