summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-01-25 17:27:36 +0000
committerNeil Johnson <neil@matrix.org>2019-01-25 17:27:36 +0000
commit893107be78b93699cd96d0e025ee6610bcff9c5a (patch)
tree0182b65a53be1bc8a909e6f7836510881b57cf9a
parentSupport room version capabilities in CS API (MSC1804) (diff)
downloadsynapse-893107be78b93699cd96d0e025ee6610bcff9c5a.tar.xz
backout v3
-rw-r--r--synapse/api/constants.py1
-rw-r--r--synapse/rest/client/v2_alpha/capabilities.py1
2 files changed, 0 insertions, 2 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py

index c47346a4bf..1112618329 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py
@@ -119,7 +119,6 @@ KNOWN_ROOM_VERSIONS = { RoomVersions.V2, RoomVersions.VDH_TEST, RoomVersions.STATE_V2_TEST, - RoomVersions.V3, } ServerNoticeMsgType = "m.server_notice" diff --git a/synapse/rest/client/v2_alpha/capabilities.py b/synapse/rest/client/v2_alpha/capabilities.py
index d73153ccc7..61319a7a2e 100644 --- a/synapse/rest/client/v2_alpha/capabilities.py +++ b/synapse/rest/client/v2_alpha/capabilities.py
@@ -38,7 +38,6 @@ class CapabilitiesRestServlet(RestServlet): "1": "stable", "2": "stable", "state-v2-test": "unstable", - "3": "unstable" } } }