diff options
| author | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
| commit | 7941c30117efe1b957ac0458c2f0479e3824196d (patch) | |
| tree | df791632a9dc790a6f73dec53aae3ba919ebda63 /config/default.json | |
| parent | e1cd64613591cf5a990442a69ebf188258bd0cb5 (diff) | |
| parent | 034dbc07e3068c482e654b6a1a8fcbe4b01c44f3 (diff) | |
| download | chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.gz chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.bz2 chat-7941c30117efe1b957ac0458c2f0479e3824196d.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'config/default.json')
| -rw-r--r-- | config/default.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/default.json b/config/default.json index 4bcccdf19..0c07f9793 100644 --- a/config/default.json +++ b/config/default.json @@ -59,6 +59,7 @@ "ExperimentalEnableDefaultChannelLeaveJoinMessages": true, "ExperimentalGroupUnreadChannels": false, "ImageProxyType": "", + "ImageProxyOptions": "", "ImageProxyURL": "" }, "TeamSettings": { @@ -180,6 +181,7 @@ "MaxBurst": 100, "MemoryStoreSize": 10000, "VaryByRemoteAddr": true, + "VaryByUser": false, "VaryByHeader": "" }, "PrivacySettings": { |