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
..
__init__.py	…
base_resource.py	Consistency	2015-08-27 10:50:49 +01:00
download_resource.py	…
filepath.py	…
identicon_resource.py	…
media_repository.py	…
thumbnail_resource.py	…
thumbnailer.py	…
upload_resource.py	Merge branch 'release-v0.10.0' into develop	2015-08-28 11:15:27 +01:00