diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-03-17 09:51:45 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-03-17 09:51:45 -0700 |
| commit | 5273559ca101d8ae4a55104f18081ab011e5068c (patch) | |
| tree | f152b638101b224ffc59ed000e384b651915266a /config | |
| parent | 074f15f761ff50388b58e35e8354c139c06a807e (diff) | |
| parent | 128204b47a9ff89bf2bea97cd21d3b8892151e69 (diff) | |
| download | chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.gz chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.bz2 chat-5273559ca101d8ae4a55104f18081ab011e5068c.zip | |
Fixing merge
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json index 8b58e64e4..1d54edccf 100644 --- a/config/config.json +++ b/config/config.json @@ -21,7 +21,8 @@ "SessionLengthSSOInDays": 30, "SessionCacheInMinutes": 10, "WebsocketSecurePort": 443, - "WebsocketPort": 80 + "WebsocketPort": 80, + "WebserverMode": "regular" }, "TeamSettings": { "SiteName": "Mattermost", @@ -144,4 +145,4 @@ "Directory": "./data/", "EnableDaily": false } -}
\ No newline at end of file +} |