diff options
| author | Erik Johnston <erik@matrix.org> | 2019-05-16 09:34:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 09:34:12 +0100 |
| commit | f201a30244db6369db80169be3258fa3c1f36150 (patch) | |
| tree | dee49724772693585e4cb3ef2324e86ab00aaedd /synapse/rest/__init__.py | |
| parent | Merge branch 'erikj/refactor_pagination_bounds' into erikj/reactions_base (diff) | |
| parent | Actually check for None rather falsey (diff) | |
| download | synapse-f201a30244db6369db80169be3258fa3c1f36150.tar.xz | |
Merge pull request #5186 from matrix-org/erikj/simple_pagination
Add simple relations 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 3a24d31d1b..e6110ad9b1 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -44,6 +44,7 @@ from synapse.rest.client.v2_alpha import ( read_marker, receipts, register, + relations, report_event, room_keys, room_upgrade_rest_servlet, @@ -115,6 +116,7 @@ class ClientRestResource(JsonResource): room_upgrade_rest_servlet.register_servlets(hs, client_resource) capabilities.register_servlets(hs, client_resource) account_validity.register_servlets(hs, client_resource) + relations.register_servlets(hs, client_resource) # moving to /_synapse/admin synapse.rest.admin.register_servlets_for_client_rest_resource( |