diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2023-10-31 10:32:35 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2023-10-31 10:32:35 -0400 |
| commit | 70b503f1449a99ee9735e9d30d6a2404e00901fa (patch) | |
| tree | de9b2330775dae01da6397947c6ce26de88012f8 /synapse/federation/federation_server.py | |
| parent | Merge branch 'release-v1.95' into develop (diff) | |
| download | synapse-70b503f1449a99ee9735e9d30d6a2404e00901fa.tar.xz | |
Fix import ordering issue introduced in 7a3a55ac98847d7adb0e200378abe07ef8d0c645.
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 8e3064c7e7..2bb2c64ebe 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -84,7 +84,7 @@ from synapse.replication.http.federation import ( from synapse.storage.databases.main.lock import Lock from synapse.storage.databases.main.roommember import extract_heroes_from_room_summary from synapse.storage.roommember import MemberSummary -from synapse.types import JsonDict, StateMap, get_domain_from_id, UserID +from synapse.types import JsonDict, StateMap, UserID, get_domain_from_id from synapse.util import unwrapFirstError from synapse.util.async_helpers import Linearizer, concurrently_execute, gather_results from synapse.util.caches.response_cache import ResponseCache |