summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2021-08-20 07:53:27 -0400
committerPatrick Cloke <patrickc@matrix.org>2021-08-20 07:53:27 -0400
commitfe3466a8ade18774d31a2dfe0af1c3ddb52a3dce (patch)
treeb92e74d5bf60d6f3952a6e762993ddeb81d20f80 /synapse/api
parentMerge branch 'release-v1.41' of github.com:matrix-org/synapse into matrix-org... (diff)
parentSet room version 8 as preferred for restricted rooms. (#10571) (diff)
downloadsynapse-fe3466a8ade18774d31a2dfe0af1c3ddb52a3dce.tar.xz
Merge remote-tracking branch 'origin/release-v1.41' into matrix-org-hotfixes
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/room_versions.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/room_versions.py b/synapse/api/room_versions.py

index 11280c4462..8abcdfd4fd 100644 --- a/synapse/api/room_versions.py +++ b/synapse/api/room_versions.py
@@ -293,7 +293,7 @@ MSC3244_CAPABILITIES = { ), RoomVersionCapability( "restricted", - None, + RoomVersions.V8, lambda room_version: room_version.msc3083_join_rules, ), )