diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-15 14:25:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-15 14:25:46 +0100 |
| commit | ef184caf30e69593b5f224f4a0ffde3605da2153 (patch) | |
| tree | c4affbe31ecedbee84ddf70bfc2f2c39d15e831a /synapse/notifier.py | |
| parent | Use federation handler function rather than duplicate (diff) | |
| parent | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name (diff) | |
| download | synapse-ef184caf30e69593b5f224f4a0ffde3605da2153.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_federation
Diffstat (limited to 'synapse/notifier.py')
| -rw-r--r-- | synapse/notifier.py | 2 |
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, |