diff options
| author | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2021-11-04 13:38:46 +0000 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2021-11-04 13:38:46 +0000 |
| commit | e38f7953ef62c990ec525f2819e1ad8d8ae3dbdf (patch) | |
| tree | 4eeec5fe16c5b41dd33a3c42f553bbbef26c511e /synapse/rest/admin/__init__.py | |
| parent | Simplify gatherResults and fix log contexts (diff) | |
| parent | Track ongoing event fetches correctly in the presence of failure (#11240) (diff) | |
| download | synapse-e38f7953ef62c990ec525f2819e1ad8d8ae3dbdf.tar.xz | |
Merge branch 'develop' into rei/gsfg_1
Diffstat (limited to 'synapse/rest/admin/__init__.py')
| -rw-r--r-- | synapse/rest/admin/__init__.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/rest/admin/__init__.py b/synapse/rest/admin/__init__.py index e1506deb2b..70514e814f 100644 --- a/synapse/rest/admin/__init__.py +++ b/synapse/rest/admin/__init__.py @@ -42,7 +42,6 @@ from synapse.rest.admin.registration_tokens import ( RegistrationTokenRestServlet, ) from synapse.rest.admin.rooms import ( - DeleteRoomRestServlet, ForwardExtremitiesRestServlet, JoinRoomAliasServlet, ListRoomRestServlet, @@ -221,7 +220,6 @@ def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None: RoomStateRestServlet(hs).register(http_server) RoomRestServlet(hs).register(http_server) RoomMembersRestServlet(hs).register(http_server) - DeleteRoomRestServlet(hs).register(http_server) JoinRoomAliasServlet(hs).register(http_server) VersionServlet(hs).register(http_server) UserAdminServlet(hs).register(http_server) |