Skip to content
Snippets Groups Projects
Commit d5a825ed authored by Daniel Wagner-Hall's avatar Daniel Wagner-Hall
Browse files

Merge branch 'auth' into refresh 

Conflicts:
	synapse/handlers/register.py
parents e8cf77fa 225c244a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment