summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-01-29 23:53:14 +0000
committerGitHub <noreply@github.com>2019-01-29 23:53:14 +0000
commit47d03a79fc03e1cea1ee5b2c6906b64dc8b7baf2 (patch)
treeb6ebd2855bfa7e7f1f5c80e8bd560b270a829968 /synapse/api
parentMerge pull request #4499 from matrix-org/erikj/redactions_eiah (diff)
parentNo vdh tests! (diff)
downloadsynapse-47d03a79fc03e1cea1ee5b2c6906b64dc8b7baf2.tar.xz
Merge pull request #4515 from matrix-org/erikj/room_version_v3
Enable support for room version 3
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/constants.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 4912a55785..ba519005ca 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -104,7 +104,7 @@ class ThirdPartyEntityKind(object):
 class RoomVersions(object):
     V1 = "1"
     V2 = "2"
-    V3 = "3"  # Not currently fully supported, so we don't add to known versions below
+    V3 = "3"
     STATE_V2_TEST = "state-v2-test"
 
 
@@ -116,6 +116,7 @@ DEFAULT_ROOM_VERSION = RoomVersions.V1
 KNOWN_ROOM_VERSIONS = {
     RoomVersions.V1,
     RoomVersions.V2,
+    RoomVersions.V3,
     RoomVersions.STATE_V2_TEST,
 }