Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

6f0c344c

Commit 6f0c344c authored 9 years ago by Daniel Wagner-Hall

Downloads
- Plain Diff

Merge pull request #255 from matrix-org/mergeeriksmadness

Merge erikj/user_dedup to develop

parents 3cab86a1 d3c0e488

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/auth.py 31 additions, 8 deletions

synapse/handlers/auth.py
synapse/handlers/register.py 2 additions, 2 deletions

synapse/handlers/register.py
synapse/rest/client/v1/login.py 3 additions, 2 deletions

synapse/rest/client/v1/login.py
synapse/storage/registration.py 14 additions, 0 deletions

synapse/storage/registration.py

with 50 additions and 12 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