diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-27 12:09:35 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-27 12:09:35 -0400 |
| commit | 305a74c78d25a9e8fd6a5d03a8431c160226e1f4 (patch) | |
| tree | 4382c340d3e4b7c228400f01ad21fc6a76262fb2 /config | |
| parent | d3093028cff337ede3747c6f0908eda432c3cb88 (diff) | |
| parent | 9abf980b0eadc51025282464b19d179d845b6769 (diff) | |
| download | chat-305a74c78d25a9e8fd6a5d03a8431c160226e1f4.tar.gz chat-305a74c78d25a9e8fd6a5d03a8431c160226e1f4.tar.bz2 chat-305a74c78d25a9e8fd6a5d03a8431c160226e1f4.zip | |
Merge pull request #474 from mattermost/PL-4
Fixes PL-1 and PL-3 Restricting team creation
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/config/config.json b/config/config.json index f1f3ba22c..6c915e290 100644 --- a/config/config.json +++ b/config/config.json @@ -73,8 +73,8 @@ "SMTPUsername": "", "SMTPPassword": "", "SMTPServer": "", - "UseTLS": false, - "UseStartTLS": false, + "UseTLS": false, + "UseStartTLS": false, "FeedbackEmail": "", "FeedbackName": "", "ApplePushServer": "", @@ -104,6 +104,8 @@ "HelpLink": "/static/help/configure_links.html", "ReportProblemLink": "/static/help/configure_links.html", "TourLink": "/static/help/configure_links.html", - "DefaultThemeColor": "#2389D7" + "DefaultThemeColor": "#2389D7", + "DisableTeamCreation": false, + "RestrictCreationToDomains": "" } } |