summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-07-22 10:19:16 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-07-22 10:19:16 +0100
commitfdd182870c6eddacf314f9526aadbb153786c263 (patch)
tree6f76d293aa8c6ed884f13658c2b6680eb83158b1 /synapse/config/server.py
parentMerge branch 'release-v1.2.0' into matrix-org-hotfixes (diff)
parentRevert "Remove deprecated 'verbose' cli arg" (diff)
downloadsynapse-fdd182870c6eddacf314f9526aadbb153786c263.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r--synapse/config/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py

index 080d0630bd..00170f1393 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py
@@ -136,7 +136,7 @@ class ServerConfig(Config): # Whether to enable experimental MSC1849 (aka relations) support self.experimental_msc1849_support_enabled = config.get( - "experimental_msc1849_support_enabled", False + "experimental_msc1849_support_enabled", True ) # Options to control access by tracking MAU