summary refs log tree commit diff
path: root/synapse/handlers/account_data.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/handlers/account_data.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/handlers/account_data.py')
-rw-r--r--synapse/handlers/account_data.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/account_data.py b/synapse/handlers/account_data.py

index b1a5df9638..1ce6d697ed 100644 --- a/synapse/handlers/account_data.py +++ b/synapse/handlers/account_data.py
@@ -25,7 +25,7 @@ from synapse.replication.http.account_data import ( from synapse.types import JsonDict, UserID if TYPE_CHECKING: - from synapse.app.homeserver import HomeServer + from synapse.server import HomeServer class AccountDataHandler: