Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

e555bc65

Commit e555bc65 authored 8 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'rav/refactor_device_query' into develop

parents f5da3bac a843868f

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

synapse/federation/federation_server.py 1 addition, 19 deletions

synapse/federation/federation_server.py
synapse/federation/transport/server.py 1 addition, 3 deletions

synapse/federation/transport/server.py
synapse/handlers/e2e_keys.py 130 additions, 0 deletions

synapse/handlers/e2e_keys.py
synapse/rest/client/v2_alpha/keys.py 7 additions, 39 deletions

synapse/rest/client/v2_alpha/keys.py
synapse/server.py 24 additions, 21 deletions

synapse/server.py
synapse/server.pyi 4 additions, 0 deletions

synapse/server.pyi

with 167 additions and 82 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