Merge branch 'develop' into cross-signing_federation

This commit is contained in:
Hubert Chathi 2019-10-24 22:31:25 -04:00
commit c40d7244f8
350 changed files with 5090 additions and 4592 deletions

View file

@ -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.