summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorPaul Evans <leonerd@leonerd.org.uk>2016-08-18 20:52:50 +0100
committerGitHub <noreply@github.com>2016-08-18 20:52:50 +0100
commit5674ea3e6c51b26c828fc8a78bc82832d72c50d4 (patch)
tree26f0e424dbe3ec3a1ecb5074ed32b8e55c9abbaa /synapse/rest/__init__.py
parentMerge pull request #1027 from matrix-org/erikj/appservice_stream (diff)
parentMove validation logic for AS 3PE query response into ApplicationServiceApi cl... (diff)
downloadsynapse-5674ea3e6c51b26c828fc8a78bc82832d72c50d4.tar.xz
Merge pull request #1026 from matrix-org/paul/thirdpartylookup
3rd party entity lookup
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 14227f1cdb..2e0e6babef 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -47,6 +47,7 @@ from synapse.rest.client.v2_alpha import (
     report_event,
     openid,
     devices,
+    thirdparty,
 )
 
 from synapse.http.server import JsonResource
@@ -92,3 +93,4 @@ class ClientRestResource(JsonResource):
         report_event.register_servlets(hs, client_resource)
         openid.register_servlets(hs, client_resource)
         devices.register_servlets(hs, client_resource)
+        thirdparty.register_servlets(hs, client_resource)