summaryrefslogtreecommitdiffstats
path: root/config/default.json
diff options
context:
space:
mode:
authorMartin Kraft <martinkraft@gmail.com>2018-05-25 11:25:40 -0400
committerMartin Kraft <martinkraft@gmail.com>2018-05-25 11:25:40 -0400
commitbaf697e348e329ad6b5c5bba1db8e0a53fcb8a13 (patch)
tree88acbcb69382817eb07f8c331beb195d014cdfa4 /config/default.json
parenta51b2367a34d5cbefe720232b35ccf0d1aa63c98 (diff)
parent58abb4204e2e5d7c82312ed18a3d4d1a3a5f1962 (diff)
downloadchat-baf697e348e329ad6b5c5bba1db8e0a53fcb8a13.tar.gz
chat-baf697e348e329ad6b5c5bba1db8e0a53fcb8a13.tar.bz2
chat-baf697e348e329ad6b5c5bba1db8e0a53fcb8a13.zip
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'config/default.json')
-rw-r--r--config/default.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/default.json b/config/default.json
index 1c4608c03..2d6265dcc 100644
--- a/config/default.json
+++ b/config/default.json
@@ -91,6 +91,7 @@
"EnableConfirmNotificationsToChannel": true,
"TeammateNameDisplay": "username",
"ExperimentalEnableAutomaticReplies": false,
+ "ExperimentalHideTownSquareinLHS": false,
"ExperimentalTownSquareIsReadOnly": false,
"ExperimentalPrimaryTeam": ""
},