Skip to content
Snippets Groups Projects
Commit 7ac701cc authored by kaniini's avatar kaniini
Browse files

Merge branch 'feature/s3-force-media-proxy' into 'develop' 

s3 uploader: force public URIs through media proxy

See merge request pleroma/pleroma!403
parents f61acdc5 36825932
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment