diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-01 13:42:50 +0100 |
commit | 303f1c851fc363d3fc4fc4c91328abd89863341d (patch) | |
tree | e8d8c1ba55141f3eae7aa8ea74a509e3dac42e28 /synapse/storage/event_federation.py | |
parent | fix known broken test (diff) | |
parent | Merge pull request #3543 from bebehei/docker (diff) | |
download | synapse-303f1c851fc363d3fc4fc4c91328abd89863341d.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_in_log_in_limits
Diffstat (limited to 'synapse/storage/event_federation.py')
-rw-r--r-- | synapse/storage/event_federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py index 5d3ee90017..8bd35df119 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -25,7 +25,7 @@ from twisted.internet import defer from synapse.api.errors import StoreError from synapse.metrics.background_process_metrics import run_as_background_process from synapse.storage._base import SQLBaseStore -from synapse.storage.events import EventsWorkerStore +from synapse.storage.events_worker import EventsWorkerStore from synapse.storage.signatures import SignatureWorkerStore from synapse.util.caches.descriptors import cached |