Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

9e99143c

Commit 9e99143c authored 5 years ago by David Baker

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_recaptcha_only

parents 8782bfb7 9a18e1d8

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/5155.misc 1 addition, 0 deletions

changelog.d/5155.misc
synapse/http/client.py 25 additions, 20 deletions

synapse/http/client.py
synapse/rest/media/v1/preview_url_resource.py 10 additions, 0 deletions

synapse/rest/media/v1/preview_url_resource.py
tests/rest/media/v1/test_url_preview.py 11 additions, 11 deletions

tests/rest/media/v1/test_url_preview.py

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