diff options
| author | JoramWilander <jwawilander@gmail.com> | 2018-06-27 16:56:50 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2018-06-27 16:56:50 -0400 |
| commit | 88c5e469ca869d9e8ceadb0f2b03e86005102f24 (patch) | |
| tree | bbb1b4cc1312879476f222940651e4d3e763da9e /config | |
| parent | d7976549a0b45a42c04ac043a15677b7ca1228e9 (diff) | |
| parent | 437f9f5b64ddb4e1f84e6c4e993120d074001777 (diff) | |
| download | chat-88c5e469ca869d9e8ceadb0f2b03e86005102f24.tar.gz chat-88c5e469ca869d9e8ceadb0f2b03e86005102f24.tar.bz2 chat-88c5e469ca869d9e8ceadb0f2b03e86005102f24.zip | |
Merge branch 'master' into plugins-2
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/default.json b/config/default.json index ac57fe5e4..2d1e6ceec 100644 --- a/config/default.json +++ b/config/default.json @@ -44,6 +44,9 @@ "WebserverMode": "gzip", "EnableCustomEmoji": false, "EnableEmojiPicker": true, + "EnableGifPicker": true, + "GfycatApiKey": "", + "GfycatApiSecret": "", "RestrictCustomEmojiCreation": "all", "RestrictPostDelete": "all", "AllowEditPost": "always", |