Mark Haines a7122692d9 Merge branch 'release-v0.10.0' into develop ... Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py		2015-08-28 11:15:27 +01:00
..
client	…
key	…
media	Merge branch 'release-v0.10.0' into develop	2015-08-28 11:15:27 +01:00
__init__.py	…