Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

18e04462

Commit 18e04462 authored 8 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0

parents 52389608 b557b682

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/device.py 4 additions, 0 deletions

synapse/handlers/device.py
synapse/push/push_tools.py 1 addition, 1 deletion

synapse/push/push_tools.py
synapse/rest/client/v2_alpha/keys.py 37 additions, 11 deletions

synapse/rest/client/v2_alpha/keys.py
synapse/rest/client/versions.py 5 additions, 1 deletion

synapse/rest/client/versions.py
synapse/storage/end_to_end_keys.py 15 additions, 0 deletions

synapse/storage/end_to_end_keys.py
synapse/storage/schema/delta/33/devices_for_e2e_keys.sql 19 additions, 0 deletions

synapse/storage/schema/delta/33/devices_for_e2e_keys.sql
synapse/util/presentable_names.py 4 additions, 1 deletion

synapse/util/presentable_names.py

with 85 additions and 14 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