Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

9b5bf3d8

Commit 9b5bf3d8 authored 6 years ago by Neil Johnson

Downloads
- Plain Diff

Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus

parents e25d87d9 1f24d868

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/3687.feature 1 addition, 0 deletions

changelog.d/3687.feature
synapse/api/auth.py 6 additions, 2 deletions

synapse/api/auth.py
synapse/api/errors.py 11 additions, 2 deletions

synapse/api/errors.py
synapse/config/server.py 4 additions, 0 deletions

synapse/config/server.py
synapse/handlers/register.py 14 additions, 13 deletions

synapse/handlers/register.py
tests/api/test_auth.py 5 additions, 1 deletion

tests/api/test_auth.py
tests/handlers/test_register.py 4 additions, 4 deletions

tests/handlers/test_register.py
tests/utils.py 1 addition, 0 deletions

tests/utils.py

with 46 additions and 22 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