synapse-old/synapse/app
David Baker c291a4d522 Merge branch 'develop' into pushers
Conflicts:
	synapse/handlers/events.py
	synapse/server.py
2015-01-28 12:51:05 +00:00
..
__init__.py Update copyright notices 2015-01-06 13:21:39 +00:00
homeserver.py Merge branch 'develop' into pushers 2015-01-28 12:51:05 +00:00
synctl.py Update copyright notices 2015-01-06 13:21:39 +00:00