Daniel Wagner-Hall d3c0e48859 Merge erikj/user_dedup to develop		2015-08-26 13:42:45 +01:00
..
v1	Merge erikj/user_dedup to develop	2015-08-26 13:42:45 +01:00
v2_alpha	Merge pull request #248 from matrix-org/deviceid	2015-08-25 17:19:06 +01:00
__init__.py	Move rest APIs back under the rest directory	2015-01-22 16:10:07 +00:00