diff options
| author | David Baker <dave@matrix.org> | 2017-04-21 11:35:52 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-04-21 11:35:52 +0100 |
| commit | 2e165295b7a6af244c9d9b364d9a68e6d53dbadf (patch) | |
| tree | 19faaf5edaefd3020cf2954cb090f378b5e9819f /synapse/rest/__init__.py | |
| parent | Propagate errors sensibly from proxied IS requests (diff) | |
| parent | m.read_marker -> m.fully_read (#2128) (diff) | |
| download | synapse-2e165295b7a6af244c9d9b364d9a68e6d53dbadf.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/http_request_propagate_error
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 f9f5a3e077..aa8d874f96 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -40,6 +40,7 @@ from synapse.rest.client.v2_alpha import ( register, auth, receipts, + read_marker, keys, tokenrefresh, tags, @@ -88,6 +89,7 @@ class ClientRestResource(JsonResource): register.register_servlets(hs, client_resource) auth.register_servlets(hs, client_resource) receipts.register_servlets(hs, client_resource) + read_marker.register_servlets(hs, client_resource) keys.register_servlets(hs, client_resource) tokenrefresh.register_servlets(hs, client_resource) tags.register_servlets(hs, client_resource) |