diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-08-20 00:16:18 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-08-20 00:16:18 +0100 |
| commit | 6e80c03d45c3d09a7e7457f58beff69f14034964 (patch) | |
| tree | 06d05072f93e410dbccba1437d7fd5a545c10b86 /synapse/rest/__init__.py | |
| parent | Explicit join (diff) | |
| parent | Merge pull request #1032 from matrix-org/matthew/workerdoc (diff) | |
| download | synapse-6e80c03d45c3d09a7e7457f58beff69f14034964.tar.xz | |
Merge branch 'develop' into dbkr/notifications_api
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 7c23f5a4a8..326780405e 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -48,6 +48,7 @@ from synapse.rest.client.v2_alpha import ( openid, notifications, devices, + thirdparty, ) from synapse.http.server import JsonResource @@ -94,3 +95,4 @@ class ClientRestResource(JsonResource): openid.register_servlets(hs, client_resource) notifications.register_servlets(hs, client_resource) devices.register_servlets(hs, client_resource) + thirdparty.register_servlets(hs, client_resource) |