From beac2b0da089941e12e1918d148572b0c9e15ad6 Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Thu, 6 Jul 2017 10:35:17 +0800
Subject: teammate name display setting: username as default or full_name when
 LDAP/SAML is enabled (#6857)

---
 config/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

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",
-- 
cgit v1.2.3-1-g7c22