diff options
author | Erik Johnston <erik@matrix.org> | 2016-05-09 13:05:09 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-05-09 13:05:09 +0100 |
commit | def64d6ef32ea1b2acc92e470db307e97c6eac05 (patch) | |
tree | 8d29d7d432a5b703d15f1176ae7e720b1caa5805 /synapse/storage/__init__.py | |
parent | Add bulk fetch storage API (diff) | |
parent | Merge pull request #764 from matrix-org/erikj/replication_logging (diff) | |
download | synapse-def64d6ef32ea1b2acc92e470db307e97c6eac05.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r-- | synapse/storage/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 7122b0cbb1..d970fde9e8 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -44,6 +44,7 @@ from .receipts import ReceiptsStore from .search import SearchStore from .tags import TagsStore from .account_data import AccountDataStore +from .openid import OpenIdStore from .util.id_generators import IdGenerator, StreamIdGenerator, ChainedIdGenerator @@ -81,7 +82,8 @@ class DataStore(RoomMemberStore, RoomStore, SearchStore, TagsStore, AccountDataStore, - EventPushActionsStore + EventPushActionsStore, + OpenIdStore, ): def __init__(self, db_conn, hs): |