Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

016c089f

Commit 016c089f authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents a5ea22d4 532fcc99

No related branches found

No related tags found

No related merge requests found

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/auth.py 2 additions, 1 deletion

synapse/api/auth.py
synapse/api/constants.py 2 additions, 0 deletions

synapse/api/constants.py
synapse/crypto/keyring.py 342 additions, 131 deletions

synapse/crypto/keyring.py
synapse/events/utils.py 2 additions, 0 deletions

synapse/events/utils.py
synapse/federation/federation_base.py 75 additions, 50 deletions

synapse/federation/federation_base.py
synapse/federation/federation_client.py 43 additions, 14 deletions

synapse/federation/federation_client.py
synapse/handlers/federation.py 54 additions, 0 deletions

synapse/handlers/federation.py
synapse/handlers/message.py 65 additions, 1 deletion

synapse/handlers/message.py
synapse/handlers/room.py 1 addition, 0 deletions

synapse/handlers/room.py
synapse/handlers/sync.py 48 additions, 0 deletions

synapse/handlers/sync.py
synapse/storage/keys.py 31 additions, 19 deletions

synapse/storage/keys.py
synapse/storage/state.py 61 additions, 2 deletions

synapse/storage/state.py

with 726 additions and 218 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