Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

90c14da9

Commit 90c14da9 authored 7 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'develop' into rav/db_txn_time_in_millis

parents 6324b65f 1067b963

No related branches found

No related tags found

No related merge requests found

Changes 4

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

with 69 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