diff options
author | Erik Johnston <erik@matrix.org> | 2016-05-09 13:05:09 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-05-09 13:05:09 +0100 |
commit | def64d6ef32ea1b2acc92e470db307e97c6eac05 (patch) | |
tree | 8d29d7d432a5b703d15f1176ae7e720b1caa5805 /synapse/rest/__init__.py | |
parent | Add bulk fetch storage API (diff) | |
parent | Merge pull request #764 from matrix-org/erikj/replication_logging (diff) | |
download | synapse-def64d6ef32ea1b2acc92e470db307e97c6eac05.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__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index e805cb9111..8b223e032b 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -45,6 +45,7 @@ from synapse.rest.client.v2_alpha import ( tags, account_data, report_event, + openid, ) from synapse.http.server import JsonResource @@ -88,3 +89,4 @@ class ClientRestResource(JsonResource): 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) |