summary refs log tree commit diff
path: root/synapse/rest/admin/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-08-18 17:02:47 +0100
committerErik Johnston <erik@matrix.org>2021-08-18 17:02:47 +0100
commit78a70a2e0bdff5bdf02ba093eefab0b16ebefd73 (patch)
tree8de7b7805a9840101b00529a50812d6ffcb99cc4 /synapse/rest/admin/__init__.py
parentFix weakref_slot parameter for room member storage attrs. (#10642) (diff)
parentUpdate docs/upgrade.md with new version (diff)
downloadsynapse-78a70a2e0bdff5bdf02ba093eefab0b16ebefd73.tar.xz
Merge branch 'release-v1.41' into develop
Diffstat (limited to 'synapse/rest/admin/__init__.py')
-rw-r--r--synapse/rest/admin/__init__.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/rest/admin/__init__.py b/synapse/rest/admin/__init__.py
index 2acaea3003..7f3051aef1 100644
--- a/synapse/rest/admin/__init__.py
+++ b/synapse/rest/admin/__init__.py
@@ -59,7 +59,6 @@ from synapse.rest.admin.users import (
     SearchUsersRestServlet,
     ShadowBanRestServlet,
     UserAdminServlet,
-    UserMediaRestServlet,
     UserMembershipRestServlet,
     UserRegisterServlet,
     UserRestServletV2,
@@ -222,7 +221,6 @@ def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
     SendServerNoticeServlet(hs).register(http_server)
     VersionServlet(hs).register(http_server)
     UserAdminServlet(hs).register(http_server)
-    UserMediaRestServlet(hs).register(http_server)
     UserMembershipRestServlet(hs).register(http_server)
     UserTokenRestServlet(hs).register(http_server)
     UserRestServletV2(hs).register(http_server)