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
..
client	Merge pull request #274 from matrix-org/add_threepid_fix	2015-09-10 10:36:58 +01:00
key	Remove syutil dependency in favour of smaller single-purpose libraries	2015-08-24 16:17:38 +01:00
media	Merge branch 'release-v0.10.0' into develop	2015-08-28 11:15:27 +01:00
__init__.py	Code style fixes.	2015-01-29 16:12:40 +00:00