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

Merge erikj/user_dedup to develop

2015-08-26 13:42:45 +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