diff options
author | Erik Johnston <erik@matrix.org> | 2019-05-20 14:06:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-20 14:06:40 +0100 |
commit | 57ba3451b6c22633c4aaf1bec19e91b66add65cd (patch) | |
tree | 1ffb24e6c61372dc6013fa7828ed8bc665ac2f99 /synapse/rest/__init__.py | |
parent | Limit UserIds to a length that fits in a state key (#5198) (diff) | |
parent | Newsfile (diff) | |
download | synapse-57ba3451b6c22633c4aaf1bec19e91b66add65cd.tar.xz |
Merge pull request #5209 from matrix-org/erikj/reactions_base
Land basic reaction and edit support.
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( |