summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2024-04-23 17:10:20 +0100
committerRichard van der Hoff <richard@matrix.org>2024-04-23 17:10:20 +0100
commit6a4c6a1492e6a578090227b6e8ff0ab892bd6903 (patch)
tree9247f1020288d0cbe68b8206987c30ab6083dc27 /docker
parentMerge branch 'rav/log_state_desync' into active_branches_base (diff)
parentEnable MSC4115 in complement tests (diff)
downloadsynapse-github/rav/work.tar.xz
Merge branch 'rav/event_visibility' into active_branches_base github/rav/work rav/work
Diffstat (limited to 'docker')
-rw-r--r--docker/complement/conf/workers-shared-extra.yaml.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/complement/conf/workers-shared-extra.yaml.j2 b/docker/complement/conf/workers-shared-extra.yaml.j2

index 32eada4419..a2c378f547 100644 --- a/docker/complement/conf/workers-shared-extra.yaml.j2 +++ b/docker/complement/conf/workers-shared-extra.yaml.j2
@@ -92,8 +92,6 @@ allow_device_name_lookup_over_federation: true ## Experimental Features ## experimental_features: - # client-side support for partial state in /send_join responses - faster_joins: true # Enable support for polls msc3381_polls_enabled: true # Enable deleting device-specific notification settings stored in account data @@ -105,6 +103,8 @@ experimental_features: # no UIA for x-signing upload for the first time msc3967_enabled: true + msc4115_membership_on_events: true + server_notices: system_mxid_localpart: _server system_mxid_display_name: "Server Alert"