summaryrefslogtreecommitdiffstats
path: root/config/default.json
diff options
context:
space:
mode:
authorJesús Espino <jespinog@gmail.com>2018-02-07 18:05:23 +0100
committerJesús Espino <jespinog@gmail.com>2018-02-07 18:05:23 +0100
commita04b02081a77497ecfc7a5ae9ffb0ca28404dd0e (patch)
tree985cb699d278f68522b08b60b1e7b84e0bd243fc /config/default.json
parent7941c30117efe1b957ac0458c2f0479e3824196d (diff)
parent7bd298ceaa24c0721e0acd65692cb2d1ca4983f3 (diff)
downloadchat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.tar.gz
chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.tar.bz2
chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.zip
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1
Diffstat (limited to 'config/default.json')
-rw-r--r--config/default.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/default.json b/config/default.json
index 0c07f9793..934635cb9 100644
--- a/config/default.json
+++ b/config/default.json
@@ -57,7 +57,7 @@
"CloseUnusedDirectMessages": false,
"EnableTutorial": true,
"ExperimentalEnableDefaultChannelLeaveJoinMessages": true,
- "ExperimentalGroupUnreadChannels": false,
+ "ExperimentalGroupUnreadChannels": "disabled",
"ImageProxyType": "",
"ImageProxyOptions": "",
"ImageProxyURL": ""