David Baker c291a4d522 Merge branch 'develop' into pushers ... Conflicts: synapse/handlers/events.py synapse/server.py		2015-01-28 12:51:05 +00:00
..
v1	Merge branch 'develop' into pushers	2015-01-28 12:51:05 +00:00
v2_alpha	Add client v2_alpha resource to synapse server resource tree	2015-01-23 18:55:19 +00:00
__init__.py	Move rest APIs back under the rest directory	2015-01-22 16:10:07 +00:00