Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

784aaa53

Commit 784aaa53 authored 9 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into markjh/SYT-8-recaptcha

Conflicts:
	synapse/handlers/auth.py

parents d94590ed afbd3b2f

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

synapse/config/registration.py 1 addition, 1 deletion

synapse/config/registration.py
synapse/handlers/auth.py 1 addition, 0 deletions

synapse/handlers/auth.py
synapse/http/client.py 5 additions, 2 deletions

synapse/http/client.py
synapse/http/matrixfederationclient.py 4 additions, 2 deletions

synapse/http/matrixfederationclient.py
synapse/util/jsonobject.py 1 addition, 11 deletions

synapse/util/jsonobject.py

with 12 additions and 16 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 sign in to comment