MatrixSynapse/synapse/app
Kegan Dougal c059c9fea5 Merge branch 'develop' into application-services
Conflicts:
	synapse/handlers/__init__.py
	synapse/storage/__init__.py
2015-02-02 15:57:59 +00:00
..
__init__.py Update copyright notices 2015-01-06 13:21:39 +00:00
homeserver.py Merge branch 'develop' into application-services 2015-02-02 15:57:59 +00:00
synctl.py Update copyright notices 2015-01-06 13:21:39 +00:00