summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2018-07-07 12:04:18 -0400
committerJoramWilander <jwawilander@gmail.com>2018-07-07 12:04:18 -0400
commitb78b216a3c8eb354085f97f33dac5e7661ac9188 (patch)
treedc7a253730a684bc6744c0b0bf36a87944242583 /config
parent359f12db33d45b6ffade0872ddf3652a5c52f4a8 (diff)
parent9e5ec7d09d4c51e278f17f25fb6c0f3484b50a3b (diff)
downloadchat-b78b216a3c8eb354085f97f33dac5e7661ac9188.tar.gz
chat-b78b216a3c8eb354085f97f33dac5e7661ac9188.tar.bz2
chat-b78b216a3c8eb354085f97f33dac5e7661ac9188.zip
Merge branch 'master' into plugins-2
Diffstat (limited to 'config')
-rw-r--r--config/default.json8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/default.json b/config/default.json
index 6e4f6d1eb..a4487888e 100644
--- a/config/default.json
+++ b/config/default.json
@@ -44,9 +44,9 @@
"WebserverMode": "gzip",
"EnableCustomEmoji": false,
"EnableEmojiPicker": true,
- "EnableGifPicker": true,
- "GfycatApiKey": "",
- "GfycatApiSecret": "",
+ "EnableGifPicker": false,
+ "GfycatApiKey": "2_KtH_W5",
+ "GfycatApiSecret": "3wLVZPiswc3DnaiaFoLkDvB4X0IV6CpMkj4tf2inJRsBY6-FnkT08zGmppWFgeof",
"RestrictCustomEmojiCreation": "all",
"RestrictPostDelete": "all",
"AllowEditPost": "always",
@@ -152,7 +152,7 @@
"Directory": "./data/",
"EnablePublicLink": false,
"PublicLinkSalt": "",
- "InitialFont": "luximbi.ttf",
+ "InitialFont": "nunito-bold.ttf",
"AmazonS3AccessKeyId": "",
"AmazonS3SecretAccessKey": "",
"AmazonS3Bucket": "",