Mark Haines dc3c2823ac Merge branch 'develop' into event_signing ... Conflicts: synapse/federation/replication.py		2014-10-17 17:33:58 +01:00
..
__init__.py	Include hashes of previous pdus when referencing them	2014-10-16 23:25:12 +01:00
factory.py	SPEC-7: Rename 'ts' to 'origin_server_ts'	2014-10-17 17:12:25 +01:00
room.py	Rename deletions to redactions	2014-09-24 15:27:59 +01:00
utils.py	persist hashes and origin signatures for PDUs	2014-10-15 17:09:04 +01:00