Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts

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):