summary refs log tree commit diff
path: root/synapse/events
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/events
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/events')
-rw-r--r--synapse/events/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py

index 697cf58582..20c1ab4203 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py
@@ -346,6 +346,8 @@ def room_version_to_event_format(room_version): RoomVersions.V1, RoomVersions.V2, RoomVersions.STATE_V2_TEST, ): return EventFormatVersions.V1 + elif room_version in (RoomVersions.V3,): + return EventFormatVersions.V2 else: raise RuntimeError("Unrecognized room version %s" % (room_version,))