summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-04 19:08:27 +0100
committerErik Johnston <erik@matrix.org>2016-05-04 19:08:27 +0100
commitfee1118a207f1f07f21c3b8bf52d40c4f891bbcb (patch)
treec563ec6102a9899981b51bfc51945a3d9baef664 /synapse/rest/__init__.py
parentImplement basic ignore user (diff)
parentMerge pull request #762 from matrix-org/erikj/report_event (diff)
downloadsynapse-fee1118a207f1f07f21c3b8bf52d40c4f891bbcb.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
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 6688fa8fa0..e805cb9111 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -44,6 +44,7 @@ from synapse.rest.client.v2_alpha import (
     tokenrefresh,
     tags,
     account_data,
+    report_event,
 )
 
 from synapse.http.server import JsonResource
@@ -86,3 +87,4 @@ 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)