summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2018-10-15 10:19:43 +0100
committerGitHub <noreply@github.com>2018-10-15 10:19:43 +0100
commit03c11032c346645ce5fc092f0755aaae39ff3bc7 (patch)
treee96e6846363f59c82513ffaf5f976c0b475f2d06 /synapse/rest/__init__.py
parentMerge pull request #4033 from intelfx/py37-hotfixes (diff)
parentmissed one (diff)
downloadsynapse-03c11032c346645ce5fc092f0755aaae39ff3bc7.tar.xz
Merge pull request #4019 from matrix-org/dbkr/e2e_backups
E2E backups
Diffstat (limited to 'synapse/rest/__init__.py')
-rw-r--r--synapse/rest/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py
index 3418f06fd6..4856822a5d 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -46,6 +46,7 @@ from synapse.rest.client.v2_alpha import (
     receipts,
     register,
     report_event,
+    room_keys,
     sendtodevice,
     sync,
     tags,
@@ -102,6 +103,7 @@ class ClientRestResource(JsonResource):
         auth.register_servlets(hs, client_resource)
         receipts.register_servlets(hs, client_resource)
         read_marker.register_servlets(hs, client_resource)
+        room_keys.register_servlets(hs, client_resource)
         keys.register_servlets(hs, client_resource)
         tokenrefresh.register_servlets(hs, client_resource)
         tags.register_servlets(hs, client_resource)