diff options
author | Jesse Hallam <jesse.hallam@gmail.com> | 2018-10-25 13:25:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-25 13:25:27 -0400 |
commit | 937b6480d534b3051cadf4a892a9aa210bec579a (patch) | |
tree | 7f8bcbde439f25cc9c0e405329ddf8a788208319 /config | |
parent | 1074a1c7ab0769b0da3525282fcabf961e2ddfce (diff) | |
download | chat-master.tar.gz chat-master.tar.bz2 chat-master.zip |
* MM-12342: merge the experimental channel store
* gofmt after upgrading to go 1.11
Diffstat (limited to 'config')
-rw-r--r-- | config/default.json | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/default.json b/config/default.json index 3daa6a3e0..6d428dd4a 100644 --- a/config/default.json +++ b/config/default.json @@ -133,8 +133,7 @@ "MaxOpenConns": 300, "Trace": false, "AtRestEncryptKey": "", - "QueryTimeout": 30, - "EnablePublicChannelsMaterialization": true + "QueryTimeout": 30 }, "LogSettings": { "EnableConsole": true, |