diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-20 14:49:43 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-20 14:49:43 +0100 |
| commit | 4d664278afc044e0d6118de4e22bccbf5464402c (patch) | |
| tree | 58a6364007ecfbdb6f51f997bbd86f4e538dd8ef /synapse/storage/roommember.py | |
| parent | Remove redundant room_version checks (diff) | |
| parent | Merge pull request #3719 from matrix-org/erikj/use_cache_fact (diff) | |
| download | synapse-4d664278afc044e0d6118de4e22bccbf5464402c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_state_handler
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 |