summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-06 15:59:20 +0100
committerErik Johnston <erik@matrix.org>2016-05-06 15:59:20 +0100
commit012cb5416cded6453e676696d74cab871db4aaf8 (patch)
tree71f21e4d6d4a6fd4037cfbf0a200667d29f46247 /synapse/rest/__init__.py
parentDelete old pushers (diff)
parentMerge pull request #767 from matrix-org/erikj/transaction_txn (diff)
downloadsynapse-012cb5416cded6453e676696d74cab871db4aaf8.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/push_actions_delete
Diffstat (limited to 'synapse/rest/__init__.py')
-rw-r--r--synapse/rest/__init__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py
index 6688fa8fa0..8b223e032b 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -44,6 +44,8 @@ from synapse.rest.client.v2_alpha import (
     tokenrefresh,
     tags,
     account_data,
+    report_event,
+    openid,
 )
 
 from synapse.http.server import JsonResource
@@ -86,3 +88,5 @@ class ClientRestResource(JsonResource):
         tokenrefresh.register_servlets(hs, client_resource)
         tags.register_servlets(hs, client_resource)
         account_data.register_servlets(hs, client_resource)
+        report_event.register_servlets(hs, client_resource)
+        openid.register_servlets(hs, client_resource)