summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMartin Kraft <martinkraft@gmail.com>2018-05-11 08:05:23 -0400
committerMartin Kraft <martinkraft@gmail.com>2018-05-11 08:05:23 -0400
commit91557bbd978500388a11b99401783164e143a966 (patch)
tree676d6278d957df20f21d5e367d1f447ee281414e /config
parent11c60ea41afd419036edc54b5571f26ce680c93c (diff)
parent2b27e12445ba51e1fa1ab2aceac5fcb3de66845d (diff)
downloadchat-91557bbd978500388a11b99401783164e143a966.tar.gz
chat-91557bbd978500388a11b99401783164e143a966.tar.bz2
chat-91557bbd978500388a11b99401783164e143a966.zip
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'config')
-rw-r--r--config/default.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/default.json b/config/default.json
index 8bf06dc8b..80a694e38 100644
--- a/config/default.json
+++ b/config/default.json
@@ -263,6 +263,7 @@
"NicknameAttribute": "",
"IdAttribute": "",
"PositionAttribute": "",
+ "LoginIdAttribute": "",
"SyncIntervalMinutes": 60,
"SkipCertificateVerification": false,
"QueryTimeout": 60,