summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-02-18 17:18:06 +0000
committerGitHub <noreply@github.com>2019-02-18 17:18:06 +0000
commitfc2c245a1f6a2735782d5fe5d65784b4935d1937 (patch)
tree7058a9de4246c62840f123ea8580c7d497a68c75 /synapse/app
parentMerge pull request #4668 from matrix-org/erikj/catch_exceptions (diff)
parentMove register_device into handler (diff)
downloadsynapse-fc2c245a1f6a2735782d5fe5d65784b4935d1937.tar.xz
Merge pull request #4666 from matrix-org/erikj/register_login_split
Split out registration to worker
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/client_reader.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py
index a9d2147022..9250b6c239 100644
--- a/synapse/app/client_reader.py
+++ b/synapse/app/client_reader.py
@@ -47,6 +47,7 @@ from synapse.rest.client.v1.room import (
     RoomMemberListRestServlet,
     RoomStateRestServlet,
 )
+from synapse.rest.client.v2_alpha.register import RegisterRestServlet
 from synapse.server import HomeServer
 from synapse.storage.engines import create_engine
 from synapse.util.httpresourcetree import create_resource_tree
@@ -92,6 +93,7 @@ class ClientReaderServer(HomeServer):
                     JoinedRoomMemberListRestServlet(self).register(resource)
                     RoomStateRestServlet(self).register(resource)
                     RoomEventContextServlet(self).register(resource)
+                    RegisterRestServlet(self).register(resource)
 
                     resources.update({
                         "/_matrix/client/r0": resource,