OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Actually merge into develop.

pull/50/head
Kegan Dougal 2015-02-02 16:05:34 +00:00
parent c059c9fea5
commit a006d168c5
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
synapse/storage/__init__.py
View File

@ -67,12 +67,9 @@ SCHEMAS = [
"event_signatures",
"pusher",
"media_repository",
<<<<<<< HEAD
"application_services"
=======
"filtering",
"rejections",
>>>>>>> develop
]
@ -92,17 +89,13 @@ class DataStore(RoomMemberStore, RoomStore,
RegistrationStore, StreamStore, ProfileStore, FeedbackStore,
PresenceStore, TransactionStore,
DirectoryStore, KeyStore, StateStore, SignatureStore,
<<<<<<< HEAD
EventFederationStore, MediaRepositoryStore,
ApplicationServiceStore
=======
ApplicationServiceStore,
EventFederationStore,
MediaRepositoryStore,
RejectionsStore,
FilteringStore,
PusherStore,
PushRuleStore
>>>>>>> develop
):
def __init__(self, hs):