Mark Haines 7c06399512 Merge branch 'develop' into request_logging ...

Conflicts:
	synapse/config/logger.py

2014-10-30 11:13:58 +00:00

..

__init__.py

Fix pep8 warnings

2014-10-30 11:10:17 +00:00

client.py

Merge branch 'develop' into request_logging

2014-10-30 11:13:58 +00:00

content_repository.py

Fix pep8 warnings

2014-10-30 11:10:17 +00: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

Add a request-id to each log line

2014-10-30 01:21:33 +00:00