summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-05-11 11:53:04 -0400
committerChristopher Speller <crspeller@gmail.com>2016-05-11 11:53:04 -0400
commite1388877ad95c55915e58eb6ce7c6a885b6e00bf (patch)
tree0e43075690d1a6d968d5722342ae9e07d9324565 /config
parent45b22f312d3f57c63f86ffdbbb50c29108099993 (diff)
parenta574397a7256bed7738f499019f97ab468b5161d (diff)
downloadchat-e1388877ad95c55915e58eb6ce7c6a885b6e00bf.tar.gz
chat-e1388877ad95c55915e58eb6ce7c6a885b6e00bf.tar.bz2
chat-e1388877ad95c55915e58eb6ce7c6a885b6e00bf.zip
Merge branch 'release-3.0'
Diffstat (limited to 'config')
-rw-r--r--config/config.json3
1 files changed, 1 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json
index 7eff8ad37..b62713a91 100644
--- a/config/config.json
+++ b/config/config.json
@@ -148,8 +148,7 @@
"IdAttribute": "",
"SkipCertificateVerification": false,
"QueryTimeout": 60,
- "LoginFieldName": "",
- "PasswordFieldName": ""
+ "LoginFieldName": ""
},
"ComplianceSettings": {
"Enable": false,