Mark Haines 396a67a09a Merge branch 'client_v2_filter' into client_v2_sync ... Conflicts: synapse/rest/client/v2_alpha/__init__.py		2015-01-29 14:58:00 +00:00
..
v1	Change uses of get_user_by_req because it returns a tuple now.	2015-01-28 18:04:40 +00:00
v2_alpha	Merge branch 'client_v2_filter' into client_v2_sync	2015-01-29 14:58:00 +00:00
__init__.py	Move rest APIs back under the rest directory	2015-01-22 16:10:07 +00:00