summary refs log tree commit diff
path: root/synapse/storage/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-06-25 14:37:13 +0100
committerErik Johnston <erik@matrix.org>2018-06-25 14:37:13 +0100
commit4c22c9b0b6d857512c66ec6fdc03e383b8c47af3 (patch)
treeeb406b0cf027fcc7f9db1d67c9999f65ac8b6140 /synapse/storage/__init__.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentMerge pull request #3441 from matrix-org/erikj/redo_erasure (diff)
downloadsynapse-4c22c9b0b6d857512c66ec6fdc03e383b8c47af3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
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):