summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-02-27 16:11:21 +0000
committerGitHub <noreply@github.com>2019-02-27 16:11:21 +0000
commit76550c58d2912a225c7bb94751612f1d6ea8ed44 (patch)
tree283344b40726ea0793d7791436ebf6617d7e43c0 /synapse/app
parentMerge pull request #4758 from matrix-org/erikj/use_presence_replication (diff)
parentUpdate changelog.d/4759.feature (diff)
downloadsynapse-76550c58d2912a225c7bb94751612f1d6ea8ed44.tar.xz
Merge pull request #4759 from matrix-org/erikj/3pid_client_reader
Move /account/3pid to client_reader
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 043b48f8f3..5070094cad 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py
@@ -48,6 +48,7 @@ from synapse.rest.client.v1.room import ( RoomMemberListRestServlet, RoomStateRestServlet, ) +from synapse.rest.client.v2_alpha.account import ThreepidRestServlet from synapse.rest.client.v2_alpha.register import RegisterRestServlet from synapse.server import HomeServer from synapse.storage.engines import create_engine @@ -96,6 +97,7 @@ class ClientReaderServer(HomeServer): RoomEventContextServlet(self).register(resource) RegisterRestServlet(self).register(resource) LoginRestServlet(self).register(resource) + ThreepidRestServlet(self).register(resource) resources.update({ "/_matrix/client/r0": resource,