summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-16 18:07:27 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-16 18:21:05 +0100
commitd174faacc74df95ad72a3ef711cd65d4637b9e1e (patch)
treeb43240da414660c87a8bb0e904cdd33c782d7d8e /synapse/handlers/federation.py
parentMerge commit '0a86850ba' into anoa/dinsic_release_1_21_x (diff)
parentRename database classes to make some sense (#8033) (diff)
downloadsynapse-d174faacc74df95ad72a3ef711cd65d4637b9e1e.tar.xz
Merge commit 'a7bdf98d0' into anoa/dinsic_release_1_21_x
* commit 'a7bdf98d0':
  Rename database classes to make some sense (#8033)
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index 8b8e989bdc..94cce331d1 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py
@@ -71,7 +71,7 @@ from synapse.replication.http.federation import ( ) from synapse.replication.http.membership import ReplicationUserJoinedLeftRoomRestServlet from synapse.state import StateResolutionStore, resolve_events_with_store -from synapse.storage.data_stores.main.events_worker import EventRedactBehaviour +from synapse.storage.databases.main.events_worker import EventRedactBehaviour from synapse.types import JsonDict, StateMap, UserID, get_domain_from_id from synapse.util.async_helpers import Linearizer, concurrently_execute from synapse.util.distributor import user_joined_room