summary refs log tree commit diff
path: root/synapse/handlers/_base.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-07-28 10:36:55 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-07-28 10:36:55 +0100
commit1d3a9fe6e5cec793e7e259cf7e469fd4c8d79041 (patch)
tree7362257c5ff8e37b52334d06ab55d85fabc2dce8 /synapse/handlers/_base.py
parentMerge remote-tracking branch 'origin/release-v1.38' into matrix-org-hotfixes (diff)
parentFix import of the default SAML mapping provider. (#10477) (diff)
downloadsynapse-1d3a9fe6e5cec793e7e259cf7e469fd4c8d79041.tar.xz
Merge branch 'release-v1.39' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/_base.py')
-rw-r--r--synapse/handlers/_base.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py

index 525f3d39b1..6a05a65305 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py
@@ -15,8 +15,6 @@ import logging from typing import TYPE_CHECKING, Optional -import synapse.state -import synapse.storage import synapse.types from synapse.api.constants import EventTypes, Membership from synapse.api.ratelimiting import Ratelimiter