summary refs log tree commit diff
path: root/synapse/storage/__init__.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2018-07-17 15:43:33 +0100
committerDavid Baker <dave@matrix.org>2018-07-17 15:43:33 +0100
commit1d11d9323d1d5eb419cbced9417f58d155c68255 (patch)
tree7b35de324a19d67f7fab5e6bc9c637c9c2253a71 /synapse/storage/__init__.py
parentMerge pull request #3502 from matrix-org/matthew/dinsic-tweak-display-names (diff)
parentchangelog (diff)
downloadsynapse-1d11d9323d1d5eb419cbced9417f58d155c68255.tar.xz
Merge remote-tracking branch 'origin/master' into dinsic
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r--synapse/storage/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py

index 979fa22438..e843b702b9 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py
@@ -20,6 +20,7 @@ import time import logging from synapse.storage.devices import DeviceStore +from synapse.storage.user_erasure_store import UserErasureStore from .appservice import ( ApplicationServiceStore, ApplicationServiceTransactionStore ) @@ -88,6 +89,7 @@ class DataStore(RoomMemberStore, RoomStore, DeviceInboxStore, UserDirectoryStore, GroupServerStore, + UserErasureStore, ): def __init__(self, db_conn, hs):