summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2018-08-16 01:13:05 +0100
committerWill Hunt <will@half-shot.uk>2018-08-16 01:13:05 +0100
commitb3e005de18d8cc0d871f3f4f4bbfee4d2eca9c24 (patch)
treef2e43f102010ea827fd94e54c79f3036b53f9539 /synapse/notifier.py
parentisorted this mess (diff)
parentMerge pull request #3686 from matrix-org/rav/changelog_links_to_prs (diff)
downloadsynapse-b3e005de18d8cc0d871f3f4f4bbfee4d2eca9c24.tar.xz
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
Diffstat (limited to 'synapse/notifier.py')
-rw-r--r--synapse/notifier.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py

index e650c3e494..82f391481c 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py
@@ -25,7 +25,7 @@ from synapse.api.errors import AuthError from synapse.handlers.presence import format_user_presence_state from synapse.metrics import LaterGauge from synapse.types import StreamToken -from synapse.util.async import ( +from synapse.util.async_helpers import ( DeferredTimeoutError, ObservableDeferred, add_timeout_to_deferred,