diff options
author | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
---|---|---|
committer | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
commit | d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e (patch) | |
tree | c832189c0f04fa02354feb419d72d6ad64b0e77f /synapse/rest/__init__.py | |
parent | pep8 (diff) | |
parent | Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades (diff) | |
download | synapse-d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e.tar.xz |
Merge branch 'develop' into travis/login-terms
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 4856822a5d..5f35c2d1be 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -47,6 +47,7 @@ from synapse.rest.client.v2_alpha import ( register, report_event, room_keys, + room_upgrade_rest_servlet, sendtodevice, sync, tags, @@ -116,3 +117,4 @@ class ClientRestResource(JsonResource): sendtodevice.register_servlets(hs, client_resource) user_directory.register_servlets(hs, client_resource) groups.register_servlets(hs, client_resource) + room_upgrade_rest_servlet.register_servlets(hs, client_resource) |