Skip to content
Snippets Groups Projects
Commit a7122692 authored by Mark Haines's avatar Mark Haines
Browse files

Merge branch 'release-v0.10.0' into develop

Conflicts:
	synapse/handlers/auth.py
	synapse/python_dependencies.py
	synapse/rest/client/v1/login.py
parents 4c569282 5371c2a1
No related branches found
No related tags found
Loading
Showing with 262 additions and 73 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment