summaryrefslogtreecommitdiffstats
path: root/config/config.json
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-01-06 16:13:10 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2016-01-06 16:13:10 -0500
commit5bcb9f1c50ed9c319d2a21f2ecb4816c51d18b40 (patch)
treeb24590d93e46414e849ef4af7cefe54b8b7061d7 /config/config.json
parent5855b5e4590889944e4a408f7185f84779fc701a (diff)
parent214c6bc15ed1d0c9f94d0f0545d3f95241893cdc (diff)
downloadchat-5bcb9f1c50ed9c319d2a21f2ecb4816c51d18b40.tar.gz
chat-5bcb9f1c50ed9c319d2a21f2ecb4816c51d18b40.tar.bz2
chat-5bcb9f1c50ed9c319d2a21f2ecb4816c51d18b40.zip
Merge pull request #1813 from mattermost/PLT-1558
PLT-1558 adding session length to config file
Diffstat (limited to 'config/config.json')
-rw-r--r--config/config.json6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json
index 7c2ec9426..c43db1e50 100644
--- a/config/config.json
+++ b/config/config.json
@@ -11,7 +11,11 @@
"EnablePostIconOverride": false,
"EnableTesting": false,
"EnableDeveloper": false,
- "EnableSecurityFixAlert": true
+ "EnableSecurityFixAlert": true,
+ "SessionLengthWebInDays" : 30,
+ "SessionLengthMobileInDays" : 30,
+ "SessionLengthSSOInDays" : 30,
+ "SessionCacheInMinutes" : 10
},
"TeamSettings": {
"SiteName": "Mattermost",