summary refs log tree commit diff
path: root/synapse/rest/admin/__init__.py
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2023-09-06 11:25:28 -0400
committerPatrick Cloke <patrickc@matrix.org>2023-09-06 11:25:28 -0400
commit55c20da4a3464d6b1bc3b789f837475c6580b057 (patch)
treeec2cab1806871561919354a67dec6978496e85ae /synapse/rest/admin/__init__.py
parentFix incorrect docstring for Ratelimiter. (#16255) (diff)
parentLink to MSC in changelog. (diff)
downloadsynapse-55c20da4a3464d6b1bc3b789f837475c6580b057.tar.xz
Merge remote-tracking branch 'origin/release-v1.91' into release-v1.92
Diffstat (limited to 'synapse/rest/admin/__init__.py')
-rw-r--r--synapse/rest/admin/__init__.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/rest/admin/__init__.py b/synapse/rest/admin/__init__.py
index 94170715fb..0d42c89ff7 100644
--- a/synapse/rest/admin/__init__.py
+++ b/synapse/rest/admin/__init__.py
@@ -47,7 +47,6 @@ from synapse.rest.admin.federation import (
     ListDestinationsRestServlet,
 )
 from synapse.rest.admin.media import ListMediaInRoom, register_servlets_for_media_repo
-from synapse.rest.admin.oidc import OIDCTokenRevocationRestServlet
 from synapse.rest.admin.registration_tokens import (
     ListRegistrationTokensRestServlet,
     NewRegistrationTokenRestServlet,
@@ -298,8 +297,6 @@ def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
     BackgroundUpdateRestServlet(hs).register(http_server)
     BackgroundUpdateStartJobRestServlet(hs).register(http_server)
     ExperimentalFeaturesRestServlet(hs).register(http_server)
-    if hs.config.experimental.msc3861.enabled:
-        OIDCTokenRevocationRestServlet(hs).register(http_server)
 
 
 def register_servlets_for_client_rest_resource(