Kegan Dougal c059c9fea5 Merge branch 'develop' into application-services ... Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py		2015-02-02 15:57:59 +00:00
..
delta	Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage	2015-01-30 14:57:33 +00:00
application_services.sql	Add basic application_services SQL, and hook up parts of the appservice store to read from it.	2015-01-28 11:59:38 +00:00
event_edges.sql	Update copyright notices	2015-01-06 13:21:39 +00:00
event_signatures.sql	Update copyright notices	2015-01-06 13:21:39 +00:00
filtering.sql	s/definition/filter_json/ since definition is now used to mean a component of the filter, rather than the complete json	2015-01-28 17:42:19 +00:00
im.sql	Put CREATE rejections into seperate .sql	2015-01-30 14:48:03 +00:00
keys.sql	Update copyright notices	2015-01-06 13:21:39 +00:00
media_repository.sql	Update copyright notices	2015-01-06 13:21:39 +00:00
presence.sql	Update copyright notices	2015-01-06 13:21:39 +00:00
profiles.sql	Update copyright notices	2015-01-06 13:21:39 +00:00
pusher.sql	Oops: second part of commit dc938606	2015-01-22 17:38:53 +00:00
redactions.sql	Update copyright notices	2015-01-06 13:21:39 +00:00
rejections.sql	Put CREATE rejections into seperate .sql	2015-01-30 14:48:03 +00:00
room_aliases.sql	Update copyright notices	2015-01-06 13:21:39 +00:00
state.sql	Update copyright notices	2015-01-06 13:21:39 +00:00
transactions.sql	Add index on transaction_id to sent_transcations	2015-01-06 15:40:38 +00:00
users.sql	Update copyright notices	2015-01-06 13:21:39 +00:00