diff options
| author | Erik Johnston <erik@matrix.org> | 2015-07-13 13:50:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-07-13 13:50:57 +0100 |
| commit | 5989637f37b127f2a0c55ef0b1085ebd0d2928c1 (patch) | |
| tree | 0480f8a77111f35aede6622e7ff0ed8329b6a6dd /synapse/storage/__init__.py | |
| parent | Comments (diff) | |
| parent | Merge pull request #196 from matrix-org/erikj/room_history (diff) | |
| download | synapse-5989637f37b127f2a0c55ef0b1085ebd0d2928c1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 2bc88a7954..71d5d92500 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -37,6 +37,7 @@ from .rejections import RejectionsStore from .state import StateStore from .signatures import SignatureStore from .filtering import FilteringStore +from .end_to_end_keys import EndToEndKeyStore from .receipts import ReceiptsStore @@ -77,6 +78,7 @@ class DataStore(RoomMemberStore, RoomStore, ApplicationServiceTransactionStore, EventsStore, ReceiptsStore, + EndToEndKeyStore, ): def __init__(self, hs): |