Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

5e543652

Commit 5e543652 authored 10 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into single_source_version_and_dependencies

parents a9684730 84a769cd

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

synapse/app/homeserver.py 1 addition, 1 deletion

synapse/app/homeserver.py
synapse/crypto/keyclient.py 2 additions, 2 deletions

synapse/crypto/keyclient.py
synapse/handlers/presence.py 4 additions, 4 deletions

synapse/handlers/presence.py
synapse/handlers/sync.py 1 addition, 1 deletion

synapse/handlers/sync.py
synapse/rest/client/v1/directory.py 1 addition, 1 deletion

synapse/rest/client/v1/directory.py
synapse/rest/client/v2_alpha/sync.py 1 addition, 1 deletion

synapse/rest/client/v2_alpha/sync.py
synapse/rest/media/v1/upload_resource.py 2 additions, 2 deletions

synapse/rest/media/v1/upload_resource.py

with 12 additions and 12 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