Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

5dbd1024

Commit 5dbd1024 authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'erikj/user_dedup' into release-v0.10.0

parents 1f7642ef fd5ad0f0

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/auth.py 29 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 48 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