Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

afef6f5d

Commit afef6f5d authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_take2

parents 68b255c5 f9d4da7f

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/__init__.py 0 additions, 2 deletions

synapse/handlers/__init__.py
synapse/handlers/auth.py 81 additions, 32 deletions

synapse/handlers/auth.py
synapse/handlers/login.py 0 additions, 83 deletions

synapse/handlers/login.py
synapse/handlers/register.py 5 additions, 5 deletions

synapse/handlers/register.py
synapse/push/pusherpool.py 4 additions, 7 deletions

synapse/push/pusherpool.py
synapse/rest/client/v1/login.py 2 additions, 3 deletions

synapse/rest/client/v1/login.py
synapse/rest/client/v2_alpha/account.py 3 additions, 5 deletions

synapse/rest/client/v2_alpha/account.py
synapse/rest/client/v2_alpha/register.py 1 addition, 2 deletions

synapse/rest/client/v2_alpha/register.py
synapse/storage/registration.py 6 additions, 6 deletions

synapse/storage/registration.py
synapse/storage/state.py 3 additions, 2 deletions

synapse/storage/state.py

with 105 additions and 147 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