David Baker c50ad14bae Merge branch 'develop' into email_login		2015-08-20 10:16:01 +01:00
..
v1	Merge branch 'develop' into email_login	2015-08-20 10:16:01 +01:00
v2_alpha	Merge pull request #211 from matrix-org/email_in_use	2015-08-20 10:04:04 +01:00
__init__.py	Move rest APIs back under the rest directory	2015-01-22 16:10:07 +00:00