diff options
author | =Corey Hulen <corey@hulen.com> | 2016-01-15 09:16:07 -0600 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-01-15 09:16:07 -0600 |
commit | cc71c3e70646d4e8da5e8477933fc0c1576a3087 (patch) | |
tree | 324ff1a37a43c0a4ccae24b9990973f3d287bc47 /config | |
parent | 586967b757a869dbb5f3677e605009a1f5c61005 (diff) | |
parent | c672820ff6a2a58d390c9bbc80fffdcc654e2716 (diff) | |
download | chat-cc71c3e70646d4e8da5e8477933fc0c1576a3087.tar.gz chat-cc71c3e70646d4e8da5e8477933fc0c1576a3087.tar.bz2 chat-cc71c3e70646d4e8da5e8477933fc0c1576a3087.zip |
merging
Diffstat (limited to 'config')
-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 b3822692e..1a4156c8f 100644 --- a/config/config.json +++ b/config/config.json @@ -109,28 +109,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 +} |