Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

0486a781

Commit 0486a781 authored 7 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'develop' into rav/rework_run_interaction

parents 8615f19d 1067b963

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

synapse/config/tls.py 1 addition, 1 deletion

synapse/config/tls.py
synapse/rest/media/v1/media_repository.py 42 additions, 14 deletions

synapse/rest/media/v1/media_repository.py
synapse/rest/media/v1/preview_url_resource.py 6 additions, 2 deletions

synapse/rest/media/v1/preview_url_resource.py
synapse/rest/media/v1/thumbnail_resource.py 20 additions, 8 deletions

synapse/rest/media/v1/thumbnail_resource.py
synapse/util/logcontext.py 18 additions, 7 deletions

synapse/util/logcontext.py
tests/crypto/test_keyring.py 7 additions, 7 deletions

tests/crypto/test_keyring.py
tests/util/test_logcontext.py 8 additions, 8 deletions

tests/util/test_logcontext.py

with 102 additions and 47 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