diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-28 09:14:37 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-28 09:14:37 -0400 |
| commit | 75af5d4536cc414d171c2fe6dca78e455eb18b37 (patch) | |
| tree | 4e00cf97b5f4f570b1901093bfa4e208749932a0 /config/config.json | |
| parent | d107b392a6309a41eac6cd7d07d720a21968eb56 (diff) | |
| parent | f5fec3a157e6c9146a0c4e28dd5f70e6c066affd (diff) | |
| download | chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.tar.gz chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.tar.bz2 chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.zip | |
Merge pull request #496 from mattermost/mm-2015
MM-2015 Added the ability to create a team with SSO services and added the ability to turn off email sign up.
Diffstat (limited to 'config/config.json')
| -rw-r--r-- | config/config.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json index 6c915e290..e0f3232ed 100644 --- a/config/config.json +++ b/config/config.json @@ -22,7 +22,8 @@ "AnalyticsUrl": "", "UseLocalStorage": true, "StorageDirectory": "./data/", - "AllowedLoginAttempts": 10 + "AllowedLoginAttempts": 10, + "AllowEmailSignUp": true }, "SSOSettings": { "gitlab": { |