Mark Haines 984e207b59 Merge branch develop into server2server_signing ...

Conflicts:
	synapse/app/homeserver.py

2014-10-13 10:58:50 +01:00

..

__init__.py

Reference Matrix Home Server

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

test_federation.py

Merge branch develop into server2server_signing

2014-10-13 10:58:50 +01:00

test_pdu_codec.py

Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY

2014-09-12 18:46:13 +01:00