Mark Haines e903c941cb Merge branch 'develop' into request_logging ... Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py		2014-11-14 11:16:50 +00:00
..
__init__.py	…
client.py	…
content_repository.py	apply some cache headers to try to make the content repo less nutso	2014-11-11 05:36:39 +00:00
endpoint.py	…
server.py	…
server_key_resource.py	…