Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

cc01eae3

Commit cc01eae3 authored 8 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 85e98fd4 14d5e227

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

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

synapse/handlers/device.py
synapse/rest/client/v2_alpha/keys.py 1 addition, 1 deletion

synapse/rest/client/v2_alpha/keys.py
synapse/storage/stream.py 14 additions, 0 deletions

synapse/storage/stream.py

with 57 additions and 5 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