diff options
| author | Asaad Mahmood <asaad@spinpunch.com> | 2016-01-20 10:38:13 +0500 |
|---|---|---|
| committer | Asaad Mahmood <asaad@spinpunch.com> | 2016-01-20 10:38:13 +0500 |
| commit | 547ad113c171ba9d2e3d7fc536b3184440b52303 (patch) | |
| tree | c7afbb4684d63516e68b47b4a2a8fd8c52d813b2 /config/config.json | |
| parent | 2b69cf31aea40d12690e97ce3981e3bd955f501b (diff) | |
| parent | 1acd38b7b19521d06d274c42c00ce7072cd92196 (diff) | |
| download | chat-547ad113c171ba9d2e3d7fc536b3184440b52303.tar.gz chat-547ad113c171ba9d2e3d7fc536b3184440b52303.tar.bz2 chat-547ad113c171ba9d2e3d7fc536b3184440b52303.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'config/config.json')
| -rw-r--r-- | config/config.json | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/config/config.json b/config/config.json index 907b66828..b00dbc201 100644 --- a/config/config.json +++ b/config/config.json @@ -107,28 +107,5 @@ "AuthEndpoint": "", "TokenEndpoint": "", "UserApiEndpoint": "" - }, - "GoogleSettings": { - "Enable": false, - "Secret": "", - "Id": "", - "Scope": "", - "AuthEndpoint": "", - "TokenEndpoint": "", - "UserApiEndpoint": "" - }, - "LdapSettings": { - "Enable": false, - "LdapServer": null, - "LdapPort": 389, - "BaseDN": null, - "BindUsername": null, - "BindPassword": null, - "FirstNameAttribute": null, - "LastNameAttribute": null, - "EmailAttribute": null, - "UsernameAttribute": null, - "IdAttribute": null, - "QueryTimeout": 60 } -}
\ No newline at end of file +} |