summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-10-29 12:47:20 +0000
committerGitHub <noreply@github.com>2018-10-29 12:47:20 +0000
commitbf33eed60977223e718ded80e5031fa5f08c2442 (patch)
tree225c053f63ce92495772dad850c8501292ee1ca5 /synapse/rest/__init__.py
parentMake the replication logger quieter (#4108) (diff)
parentoptimise state copying (diff)
downloadsynapse-bf33eed60977223e718ded80e5031fa5f08c2442.tar.xz
Merge pull request #4091 from matrix-org/rav/room_version_upgrades
Room version upgrade support
Diffstat (limited to 'synapse/rest/__init__.py')
-rw-r--r--synapse/rest/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py
index 4856822a5d..5f35c2d1be 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -47,6 +47,7 @@ from synapse.rest.client.v2_alpha import (
     register,
     report_event,
     room_keys,
+    room_upgrade_rest_servlet,
     sendtodevice,
     sync,
     tags,
@@ -116,3 +117,4 @@ class ClientRestResource(JsonResource):
         sendtodevice.register_servlets(hs, client_resource)
         user_directory.register_servlets(hs, client_resource)
         groups.register_servlets(hs, client_resource)
+        room_upgrade_rest_servlet.register_servlets(hs, client_resource)