summaryrefslogtreecommitdiff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-08-22 14:38:48 +0100
committerRichard van der Hoff <richard@matrix.org>2018-08-22 14:38:48 +0100
commitd18dd479ff799e77f326baa58052785255ad2d87 (patch)
tree61c89bfad10f58e3974214f7d336ef234daf5cad /synapse/notifier.py
parent9ac9a9ab1020ec4bf395ccf3e07ba6192f6ac558 (diff)
Imported Upstream version 0.33.3
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 e650c3e4..82f39148 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,