diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-01 19:57:28 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-01 19:57:28 +0100 |
| commit | f452899fe2a1bcf3f9d3313eeb108660b5cbf677 (patch) | |
| tree | edae89fefddc1f820f5bcae8409a85c36f1b2a0e /synapse/storage/__init__.py | |
| parent | Fix the tests to include new db calls (diff) | |
| parent | Merge branch 'server2server_tls' into develop (diff) | |
| download | synapse-f452899fe2a1bcf3f9d3313eeb108660b5cbf677.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index cc8b59f8da..7a441391f0 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -37,6 +37,7 @@ from .roommember import RoomMemberStore from .stream import StreamStore from .pdu import StatePduStore, PduStore from .transactions import TransactionStore +from .keys import KeyStore import json import logging @@ -49,7 +50,7 @@ logger = logging.getLogger(__name__) class DataStore(RoomMemberStore, RoomStore, RegistrationStore, StreamStore, ProfileStore, FeedbackStore, PresenceStore, PduStore, StatePduStore, TransactionStore, - DirectoryStore): + DirectoryStore, KeyStore): def __init__(self, hs): super(DataStore, self).__init__(hs) |