summary refs log tree commit diff
path: root/synapse/storage/appservice.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-01 13:42:50 +0100
committerNeil Johnson <neil@matrix.org>2018-08-01 13:42:50 +0100
commit303f1c851fc363d3fc4fc4c91328abd89863341d (patch)
treee8d8c1ba55141f3eae7aa8ea74a509e3dac42e28 /synapse/storage/appservice.py
parentfix known broken test (diff)
parentMerge pull request #3543 from bebehei/docker (diff)
downloadsynapse-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/appservice.py')
-rw-r--r--synapse/storage/appservice.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py

index 9f12b360bc..31248d5e06 100644 --- a/synapse/storage/appservice.py +++ b/synapse/storage/appservice.py
@@ -22,7 +22,7 @@ from twisted.internet import defer from synapse.appservice import AppServiceTransaction from synapse.config.appservice import load_appservices -from synapse.storage.events import EventsWorkerStore +from synapse.storage.events_worker import EventsWorkerStore from ._base import SQLBaseStore