anonymousland-synapse/synapse/app
Erik Johnston 7f058c5ff7 Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
Conflicts:
	synapse/app/homeserver.py
2015-01-22 13:35:34 +00:00
..
__init__.py Update copyright notices 2015-01-06 13:21:39 +00:00
homeserver.py Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf 2015-01-22 13:35:34 +00:00
synctl.py Update copyright notices 2015-01-06 13:21:39 +00:00