diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-24 22:31:25 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-24 22:31:25 -0400 |
| commit | c40d7244f8e07538a7ab25c255e803bc54fb7cb3 (patch) | |
| tree | a502c6063ce25bb2ddaa479a7ce64d705e52b261 /synapse/federation | |
| parent | don't error if federation query doesn't have cross-signing keys (diff) | |
| parent | Merge pull request #6248 from matrix-org/erikj/move_schema_files (diff) | |
| download | synapse-c40d7244f8e07538a7ab25c255e803bc54fb7cb3.tar.xz | |
Merge branch 'develop' into cross-signing_federation
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/sender/per_destination_queue.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py index 0486af2dbf..d5d4a60c88 100644 --- a/synapse/federation/sender/per_destination_queue.py +++ b/synapse/federation/sender/per_destination_queue.py @@ -30,7 +30,7 @@ from synapse.federation.units import Edu from synapse.handlers.presence import format_user_presence_state from synapse.metrics import sent_transactions_counter from synapse.metrics.background_process_metrics import run_as_background_process -from synapse.storage import UserPresenceState +from synapse.storage.presence import UserPresenceState from synapse.util.retryutils import NotRetryingDestination, get_retry_limiter # This is defined in the Matrix spec and enforced by the receiver. |