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	…
homeserver.py	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2014-09-03 12:01:14 +01:00