summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2021-08-13 14:37:24 -0500
committerGitHub <noreply@github.com>2021-08-13 14:37:24 -0500
commitc8d54be44c1da451f01504664d568dd2f2b37316 (patch)
tree1c58b36394e9ac4334da5d08f61099f4d73e56d1 /synapse/rest/__init__.py
parentFix a harmless exception when the staged events queue is empty. (#10592) (diff)
downloadsynapse-c8d54be44c1da451f01504664d568dd2f2b37316.tar.xz
Move /batch_send to /v2_alpha directory (MSC2716) (#10576)
* Move /batch_send to /v2_alpha directory

As pointed out by @erikjohnston,
https://github.com/matrix-org/synapse/pull/10552#discussion_r685836624
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 d29f2fea5e..9cffe59ce5 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -47,6 +47,7 @@ from synapse.rest.client.v2_alpha import (
     register,
     relations,
     report_event,
+    room as roomv2,
     room_keys,
     room_upgrade_rest_servlet,
     sendtodevice,
@@ -117,6 +118,7 @@ class ClientRestResource(JsonResource):
         user_directory.register_servlets(hs, client_resource)
         groups.register_servlets(hs, client_resource)
         room_upgrade_rest_servlet.register_servlets(hs, client_resource)
+        roomv2.register_servlets(hs, client_resource)
         capabilities.register_servlets(hs, client_resource)
         account_validity.register_servlets(hs, client_resource)
         relations.register_servlets(hs, client_resource)