Mark Haines dc3c2823ac Merge branch 'develop' into event_signing ...

Conflicts:
	synapse/federation/replication.py

2014-10-17 17:33:58 +01:00

..

__init__.py

Reference Matrix Home Server

2014-08-12 15:10:52 +01:00

test_federation.py

Merge branch 'develop' into event_signing

2014-10-17 17:33:58 +01:00

test_pdu_codec.py

Merge branch 'develop' into event_signing

2014-10-17 17:33:58 +01:00