diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-16 16:26:56 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-16 16:26:56 -0400 |
| commit | b1f26540ce29cf4ff403cc7b65b20c891ca64118 (patch) | |
| tree | fd7a83ebb963dc5f0208dc4dba00aa2f730a364e /config/config.json | |
| parent | 4e11fa23d750afbefad099638530b754776a3357 (diff) | |
| parent | 47e6a33a4505e13ba4edf37ff1f8fbdadb279ee3 (diff) | |
| download | chat-b1f26540ce29cf4ff403cc7b65b20c891ca64118.tar.gz chat-b1f26540ce29cf4ff403cc7b65b20c891ca64118.tar.bz2 chat-b1f26540ce29cf4ff403cc7b65b20c891ca64118.zip | |
Merge pull request #693 from mattermost/mm-1419
Implement OAuth2 service provider functionality.
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 b97f3f310..4c4fbb255 100644 --- a/config/config.json +++ b/config/config.json @@ -23,7 +23,8 @@ "UseLocalStorage": true, "StorageDirectory": "./data/", "AllowedLoginAttempts": 10, - "DisableEmailSignUp": false + "DisableEmailSignUp": false, + "EnableOAuthServiceProvider": false }, "SSOSettings": { "gitlab": { |