diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-15 16:31:40 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-15 16:31:40 +0100 |
| commit | fc5d937550816573bd151f5a322629d12846317d (patch) | |
| tree | 5d7e59799bd513718ea3f78431aa8c4c7ab087b3 /synapse/state.py | |
| parent | wip cut at sending resource server notices (diff) | |
| parent | Merge pull request #3653 from matrix-org/erikj/split_federation (diff) | |
| download | synapse-fc5d937550816573bd151f5a322629d12846317d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'synapse/state.py')
| -rw-r--r-- | synapse/state.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state.py b/synapse/state.py index e1092b97a9..8b92d4057a 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -28,7 +28,7 @@ from synapse import event_auth from synapse.api.constants import EventTypes from synapse.api.errors import AuthError from synapse.events.snapshot import EventContext -from synapse.util.async import Linearizer +from synapse.util.async_helpers import Linearizer from synapse.util.caches import CACHE_SIZE_FACTOR from synapse.util.caches.expiringcache import ExpiringCache from synapse.util.logutils import log_function |