Mark Haines 9c61556504 Merge branch 'develop' into client_v2_sync		2015-01-28 17:29:30 +00:00
..
v1	Merge pull request #36 from matrix-org/device_id_from_access_token	2015-01-28 17:19:28 +00:00
v2_alpha	Fix Formatting	2015-01-27 20:19:36 +00:00
__init__.py	Move rest APIs back under the rest directory	2015-01-22 16:10:07 +00:00