Merge branch 'develop' into matrix-org-hotfixes

1 files changed, 4 insertions, 4 deletions

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

index 485b3d0237..b2895355a8 100644
--- a/synapse/api/room_versions.py
+++ b/synapse/api/room_versions.py
@@ -77,9 +77,9 @@ class RoomVersions(object):
         EventFormatVersions.V2,
         StateResolutionVersions.V2,
     )
-    EVENTID_NOSLASH_TEST = RoomVersion(
-        "eventid-noslash-test",
-        RoomDisposition.UNSTABLE,
+    V4 = RoomVersion(
+        "4",
+        RoomDisposition.STABLE,
         EventFormatVersions.V3,
         StateResolutionVersions.V2,
     )
@@ -95,6 +95,6 @@ KNOWN_ROOM_VERSIONS = {
         RoomVersions.V2,
         RoomVersions.V3,
         RoomVersions.STATE_V2_TEST,
-        RoomVersions.EVENTID_NOSLASH_TEST,
+        RoomVersions.V4,
     )
 }   # type: dict[str, RoomVersion]