Erik Johnston b50ea730b1 Merge branch 'develop' of github.com:matrix-org/synapse into develop ... Conflicts: synapse/http/server.py synapse/http/content_repository.py		2014-09-03 12:01:14 +01:00
..
__init__.py	…
client.py	…
content_repository.py	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2014-09-03 12:01:14 +01:00
endpoint.py	Update default endpoint port to match the default ports in the config	2014-09-02 16:56:57 +01:00
server.py	Add option to change content repo location	2014-09-03 11:57:23 +01:00