summary refs log tree commit diff
path: root/synapse/storage/databases/main/pusher.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-03-24 12:45:54 +0000
committerRichard van der Hoff <richard@matrix.org>2021-03-24 12:45:54 +0000
commitea74189a903aec2437de31863d1bb3205f66995f (patch)
treeae56d5c6cc91cff675e0842b34da12abb0fa6a31 /synapse/storage/databases/main/pusher.py
parentRevert "Patch to temporarily drop cross-user m.key_share_requests (#8675)" (#... (diff)
parentSpaces summary: call out to other servers (#9653) (diff)
downloadsynapse-ea74189a903aec2437de31863d1bb3205f66995f.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/databases/main/pusher.py')
-rw-r--r--synapse/storage/databases/main/pusher.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/pusher.py b/synapse/storage/databases/main/pusher.py

index 85f1ebac98..c65558c280 100644 --- a/synapse/storage/databases/main/pusher.py +++ b/synapse/storage/databases/main/pusher.py
@@ -27,7 +27,7 @@ from synapse.util import json_encoder from synapse.util.caches.descriptors import cached, cachedList if TYPE_CHECKING: - from synapse.app.homeserver import HomeServer + from synapse.server import HomeServer logger = logging.getLogger(__name__)