summary refs log tree commit diff
diff options
context:
space:
mode:
authorTravis Ralston <travisr@matrix.org>2023-05-26 12:05:24 -0600
committerGitHub <noreply@github.com>2023-05-26 18:05:24 +0000
commit50918c494057dc93bfa6e37f7d140d68711846d1 (patch)
treefed4064bd740d07dec8935d886005a8244c1308b
parentDocumentation improvements to contributing guide (#15667) (#15668) (diff)
downloadsynapse-50918c494057dc93bfa6e37f7d140d68711846d1.tar.xz
Add `MSC3820opt2` as a known room version (#15678)
-rw-r--r--changelog.d/15678.misc1
-rw-r--r--synapse/api/room_versions.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/15678.misc b/changelog.d/15678.misc
new file mode 100644
index 0000000000..92eae49952
--- /dev/null
+++ b/changelog.d/15678.misc
@@ -0,0 +1 @@
+Implement "option 2" for [MSC3820](https://github.com/matrix-org/matrix-spec-proposals/pull/3820): Room version 11.
\ No newline at end of file
diff --git a/synapse/api/room_versions.py b/synapse/api/room_versions.py
index 035a14171b..c5c71e242f 100644
--- a/synapse/api/room_versions.py
+++ b/synapse/api/room_versions.py
@@ -528,6 +528,7 @@ KNOWN_ROOM_VERSIONS: Dict[str, RoomVersion] = {
         RoomVersions.V10,
         RoomVersions.MSC2716v4,
         RoomVersions.MSC3989,
+        RoomVersions.MSC3820opt2,
     )
 }