Merge branch 'feature/s3-force-media-proxy' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 29 Oct 2018 18:07:47 +0000 (18:07 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 29 Oct 2018 18:07:47 +0000 (18:07 +0000)
commit7ac701ccd211d0a1b04243e4c0591adb9f1996fc
tree4785078ba8a5a7b6826508d03aaf620d792fe46b
parentf61acdc5b41a8d05401c5d24d589f35ba1b573de
parent36825932eb04d9db3e2d24b02368d7dd709dea23
Merge branch 'feature/s3-force-media-proxy' into 'develop'

s3 uploader: force public URIs through media proxy

See merge request pleroma/pleroma!403