David Baker 184a5c81f0 Merge pull request #274 from matrix-org/add_threepid_fix ...

Fix adding threepids to an existing account

2015-09-10 10:36:58 +01:00

..

v1

Merge erikj/user_dedup to develop

2015-08-26 13:42:45 +01:00

v2_alpha

Merge pull request #274 from matrix-org/add_threepid_fix

2015-09-10 10:36:58 +01:00

__init__.py

Move rest APIs back under the rest directory

2015-01-22 16:10:07 +00:00