Mark Haines 3186c5bdbc Merge branch 'develop' into client_v2_sync		2015-01-26 16:32:40 +00:00
..
v1	Pass the current time to serialize event, rather than passing an	2015-01-26 16:11:28 +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