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/storage/roommember.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/storage/roommember.py')
| -rw-r--r-- | synapse/storage/roommember.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 10dce21cea..9b4e6d6aa8 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -26,7 +26,7 @@ from twisted.internet import defer from synapse.api.constants import EventTypes, Membership from synapse.storage.events_worker import EventsWorkerStore from synapse.types import get_domain_from_id -from synapse.util.async import Linearizer +from synapse.util.async_helpers import Linearizer from synapse.util.caches import intern_string from synapse.util.caches.descriptors import cached, cachedInlineCallbacks from synapse.util.stringutils import to_ascii |