Merge branch 'release-4.0'

2017-07-18 15:45:23 -07:00
--- a/config/config.json
+++ b/config/config.json
@@ -38,7 +38,7 @@
        "WebsocketPort": 80,
        "WebserverMode": "gzip",
        "EnableCustomEmoji": false,
-        "EnableEmojiPicker": false,
+        "EnableEmojiPicker": true,
        "RestrictCustomEmojiCreation": "all",
        "RestrictPostDelete": "all",
        "AllowEditPost": "always",