From 50918c494057dc93bfa6e37f7d140d68711846d1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Fri, 26 May 2023 12:05:24 -0600
Subject: [PATCH] Add `MSC3820opt2` as a known room version (#15678)

---
 changelog.d/15678.misc       | 1 +
 synapse/api/room_versions.py | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/15678.misc

diff --git a/changelog.d/15678.misc b/changelog.d/15678.misc
new file mode 100644
index 000000000..92eae4995
--- /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 035a14171..c5c71e242 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,
     )
 }