From f0065dcfbc69558d4c7c58066e45afe5e774b77b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 15 Jun 2022 10:39:19 +0200
Subject: [PATCH] Update config.json

---
 conf/config.json | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/config.json b/conf/config.json
index a18b07d..61494d0 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -48,8 +48,11 @@
     "AllowCookiesForSubdomains": false,
     "ExtendSessionLengthWithActivity": true,
     "SessionLengthWebInDays": 30,
+    "SessionLengthWebInHours": 720,
     "SessionLengthMobileInDays": 30,
+    "SessionLengthMobileInHours": 720,
     "SessionLengthSSOInDays": 30,
+    "SessionLengthSSOInHours": 720,
     "SessionCacheInMinutes": 10,
     "SessionIdleTimeoutInMinutes": 43200,
     "WebsocketSecurePort": 443,
@@ -454,7 +457,8 @@
     "UseNewSAMLLibrary": false,
     "CloudBilling": false,
     "EnableSharedChannels": false,
-    "EnableRemoteClusterService": false
+    "EnableRemoteClusterService": false,
+    "EnableAppBar": false
   },
   "AnalyticsSettings": {
     "MaxUsersForStatistics": 2500
@@ -532,6 +536,9 @@
       "com.mattermost.apps": {
         "Enable": true
       },
+      "com.mattermost.calls": {
+        "Enable": true
+      },
       "com.mattermost.nps": {
         "Enable": true
       },
@@ -576,12 +583,13 @@
     "CollapsedThreads": true,
     "EnableRemoteClusterService": false,
     "AppsEnabled": true,
-    "AppBarEnabled": false,
     "PluginPlaybooks": "",
     "PluginApps": "",
     "PluginFocalboard": "",
+    "PluginCalls": "",
     "PermalinkPreviews": true,
     "CallsMobile": false,
+    "CallsEnabled": true,
     "BoardsFeatureFlags": "",
     "GuidedChannelCreation": false,
     "InviteToTeam": "none",
@@ -592,7 +600,13 @@
     "UseCaseOnboarding": true,
     "GraphQL": false,
     "InsightsEnabled": false,
+<<<<<<< Updated upstream
     "CommandPalette": false
+=======
+    "CloudFree": false,
+    "CommandPalette": false,
+    "AdvancedTextEditor": true
+>>>>>>> Stashed changes
   },
   "ImportSettings": {
     "Directory": "./import",