summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-07-06 10:35:17 +0800
committerJoram Wilander <jwawilander@gmail.com>2017-07-05 22:35:17 -0400
commitbeac2b0da089941e12e1918d148572b0c9e15ad6 (patch)
treed80e26f49984d4d9c0d7deaa8884bcdedb5cd5e9 /config
parent279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c (diff)
downloadchat-beac2b0da089941e12e1918d148572b0c9e15ad6.tar.gz
chat-beac2b0da089941e12e1918d148572b0c9e15ad6.tar.bz2
chat-beac2b0da089941e12e1918d148572b0c9e15ad6.zip
teammate name display setting: username as default or full_name when LDAP/SAML is enabled (#6857)
Diffstat (limited to 'config')
-rw-r--r--config/config.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json
index eea6b6851..3401a5e4f 100644
--- a/config/config.json
+++ b/config/config.json
@@ -80,7 +80,7 @@
"UserStatusAwayTimeout": 300,
"MaxChannelsPerTeam": 2000,
"MaxNotificationsPerChannel": 1000,
- "TeammateNameDisplay": "full_name"
+ "TeammateNameDisplay": "username"
},
"SqlSettings": {
"DriverName": "mysql",