summary refs log tree commit diff
path: root/synapse/storage/_base.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-23 18:11:23 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-23 18:11:23 +0100
commit2d95fa1e5778625af66691e2c33470d7e8dcddd7 (patch)
tree3e37977013af9c867c5b8c11bfc0add74ff816ba /synapse/storage/_base.py
parentMerge commit 'e2904f720' into anoa/dinsic_release_1_31_0 (diff)
parentFederation API for Space summary (#9652) (diff)
downloadsynapse-2d95fa1e5778625af66691e2c33470d7e8dcddd7.tar.xz
Merge commit '4ecba9bd5' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r--synapse/storage/_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py

index a25c4093bc..240905329f 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py
@@ -27,7 +27,7 @@ from synapse.types import Collection, StreamToken, get_domain_from_id from synapse.util import json_decoder if TYPE_CHECKING: - from synapse.app.homeserver import HomeServer + from synapse.server import HomeServer logger = logging.getLogger(__name__)