summaryrefslogtreecommitdiffstats
path: root/config/default.json
diff options
context:
space:
mode:
authorMartin Kraft <martinkraft@gmail.com>2018-05-28 10:35:27 -0400
committerMartin Kraft <martinkraft@gmail.com>2018-05-28 10:35:27 -0400
commitc180cdbd1cba584c6e74cae7042de2290b51feb6 (patch)
tree19002d12a212d0bcc0e09d31410df548b93d77ef /config/default.json
parent7225abddeefb569f1f2da739211d7797b63814a2 (diff)
parentc37d153ffb276e501660133de836a61eec25e544 (diff)
downloadchat-c180cdbd1cba584c6e74cae7042de2290b51feb6.tar.gz
chat-c180cdbd1cba584c6e74cae7042de2290b51feb6.tar.bz2
chat-c180cdbd1cba584c6e74cae7042de2290b51feb6.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 2d6265dcc..3548339d0 100644
--- a/config/default.json
+++ b/config/default.json
@@ -71,6 +71,7 @@
"EnableTeamCreation": true,
"EnableUserCreation": true,
"EnableOpenServer": false,
+ "EnableUserDeactivation": false,
"RestrictCreationToDomains": "",
"EnableCustomBrand": false,
"CustomBrandText": "",