diff options
author | David Baker <dave@matrix.org> | 2016-05-10 14:40:19 +0200 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2016-05-10 14:40:19 +0200 |
commit | 997db0464828c8e8eac7dfa055f4fcd25e89cd29 (patch) | |
tree | d10252566e9bc96a9bdf95bcd37e4db4ead6ab62 /synapse/rest/__init__.py | |
parent | More consistent config naming (diff) | |
parent | Merge pull request #773 from matrix-org/erikj/get_domian_from_id (diff) | |
download | synapse-997db0464828c8e8eac7dfa055f4fcd25e89cd29.tar.xz |
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
Diffstat (limited to 'synapse/rest/__init__.py')
-rw-r--r-- | synapse/rest/__init__.py | 4 |
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) |