Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

a7a91391

Commit a7a91391 authored 4 years ago by Erik Johnston

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/erikj/as_mau_block' into develop

parents 70586aa6 14eab1b4

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/8962.bugfix 1 addition, 0 deletions

changelog.d/8962.bugfix
synapse/api/auth_blocking.py 7 additions, 0 deletions

synapse/api/auth_blocking.py
synapse/handlers/auth.py 7 additions, 1 deletion

synapse/handlers/auth.py
synapse/handlers/register.py 6 additions, 1 deletion

synapse/handlers/register.py
synapse/replication/http/login.py 10 additions, 2 deletions

synapse/replication/http/login.py
synapse/rest/client/v2_alpha/register.py 11 additions, 3 deletions

synapse/rest/client/v2_alpha/register.py
tests/test_mau.py 44 additions, 2 deletions

tests/test_mau.py

with 86 additions and 9 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