Erik Johnston 5989637f37 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts		2015-07-13 13:50:57 +01:00
..
end_to_end_keys.sql	…
receipts.sql	…