summaryrefslogtreecommitdiffstats
path: root/config/config.json
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-10-21 11:31:31 -0400
committerChristopher Speller <crspeller@gmail.com>2015-10-21 11:31:31 -0400
commit0e49acede9b077a1533d9a55494277fbc952d47c (patch)
tree4991c8823458d57b127eff3106466188b6403675 /config/config.json
parenta4e6cce98eb0c04deaa929ccd28b266e312c0ca1 (diff)
parent0bfdfd79f0071cfd41f2dfbe20d1cb099b57a15c (diff)
downloadchat-0e49acede9b077a1533d9a55494277fbc952d47c.tar.gz
chat-0e49acede9b077a1533d9a55494277fbc952d47c.tar.bz2
chat-0e49acede9b077a1533d9a55494277fbc952d47c.zip
Merge pull request #1131 from mattermost/PLT-350
PLT-350 allow ability to disable restricted team names
Diffstat (limited to 'config/config.json')
-rw-r--r--config/config.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json
index 37109428d..7bac58df7 100644
--- a/config/config.json
+++ b/config/config.json
@@ -17,7 +17,8 @@
"MaxUsersPerTeam": 50,
"EnableTeamCreation": true,
"EnableUserCreation": true,
- "RestrictCreationToDomains": ""
+ "RestrictCreationToDomains": "",
+ "RestrictTeamNames": true
},
"SqlSettings": {
"DriverName": "mysql",