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

client.py

Fix pyflakes errors

2014-10-02 14:37:30 +01:00

content_repository.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

endpoint.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

server_key_resource.py

Fix a few pyflakes errors in the server_key_resource

2014-09-23 18:43:34 +01:00

server.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