Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

c9eb6dfc

Commit c9eb6dfc authored 8 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents def64d6e 3f84da13

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/auth.py 8 additions, 8 deletions

synapse/api/auth.py
synapse/handlers/_base.py 3 additions, 5 deletions

synapse/handlers/_base.py
synapse/handlers/federation.py 4 additions, 8 deletions

synapse/handlers/federation.py
synapse/handlers/presence.py 2 additions, 2 deletions

synapse/handlers/presence.py
synapse/storage/roommember.py 2 additions, 5 deletions

synapse/storage/roommember.py
synapse/types.py 4 additions, 0 deletions

synapse/types.py

with 23 additions and 28 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