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

Conflicts:
	synapse/app/homeserver.py

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

..

__init__.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

pdu_codec.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

persistence.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

replication.py

Merge branch develop into server2server_signing

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

transport.py

Merge branch develop into server2server_signing

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

units.py

SYN-75 Verify signatures on server to server transactions

2014-09-30 15:15:10 +01:00