Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Actually merge into develop.

Browse Source
This commit is contained in:
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", "event_signatures",
"pusher", "pusher",
"media_repository", "media_repository",
<<<<<<< HEAD
"application_services" "application_services"
=======
"filtering", "filtering",
"rejections", "rejections",
>>>>>>> develop
] ]
@ -92,17 +89,13 @@ class DataStore(RoomMemberStore, RoomStore,
RegistrationStore, StreamStore, ProfileStore, FeedbackStore, RegistrationStore, StreamStore, ProfileStore, FeedbackStore,
PresenceStore, TransactionStore, PresenceStore, TransactionStore,
DirectoryStore, KeyStore, StateStore, SignatureStore, DirectoryStore, KeyStore, StateStore, SignatureStore,
<<<<<<< HEAD ApplicationServiceStore,
EventFederationStore, MediaRepositoryStore,
ApplicationServiceStore
=======
EventFederationStore, EventFederationStore,
MediaRepositoryStore, MediaRepositoryStore,
RejectionsStore, RejectionsStore,
FilteringStore, FilteringStore,
PusherStore, PusherStore,
PushRuleStore PushRuleStore
>>>>>>> develop
): ):
def __init__(self, hs): def __init__(self, hs):