anonymousland-synapse/synapse/app
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 add in whitespace after copyright statements to improve legibility 2014-08-13 03:14:34 +01:00
homeserver.py Merge branch 'develop' of github.com:matrix-org/synapse into develop 2014-09-03 12:01:14 +01:00