Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

4c9812f5

Commit 4c9812f5 authored 8 years ago by Erik Johnston Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #1861 from matrix-org/erikj/device_list_fixes

Device List fixes

parents 9636b240 1c13c9f6

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

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

synapse/handlers/device.py
synapse/handlers/e2e_keys.py 6 additions, 5 deletions

synapse/handlers/e2e_keys.py
synapse/storage/devices.py 2 additions, 1 deletion

synapse/storage/devices.py
synapse/storage/end_to_end_keys.py 49 additions, 13 deletions

synapse/storage/end_to_end_keys.py
synapse/storage/roommember.py 1 addition, 1 deletion

synapse/storage/roommember.py
tests/storage/test_end_to_end_keys.py 4 additions, 4 deletions

tests/storage/test_end_to_end_keys.py

with 63 additions and 25 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