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/stream.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/stream.py')
| -rw-r--r-- | synapse/storage/stream.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index 25d0097b58..b9f2b74ac6 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -43,7 +43,7 @@ from twisted.internet import defer from synapse.storage._base import SQLBaseStore from synapse.storage.engines import PostgresEngine -from synapse.storage.events import EventsWorkerStore +from synapse.storage.events_worker import EventsWorkerStore from synapse.types import RoomStreamToken from synapse.util.caches.stream_change_cache import StreamChangeCache from synapse.util.logcontext import make_deferred_yieldable, run_in_background |