Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/api/room_versions.py b/synapse/api/room_versions.py

index c9f9596ada..373a4669d0 100644
--- a/synapse/api/room_versions.py
+++ b/synapse/api/room_versions.py
@@ -181,6 +181,6 @@ KNOWN_ROOM_VERSIONS = {
         RoomVersions.V5,
         RoomVersions.V6,
         RoomVersions.MSC2176,
+        RoomVersions.MSC3083,
     )
-    # Note that we do not include MSC3083 here unless it is enabled in the config.
 }  # type: Dict[str, RoomVersion]