From: kaniini <nenolod@gmail.com>
Date: Mon, 29 Oct 2018 18:07:47 +0000 (+0000)
Subject: Merge branch 'feature/s3-force-media-proxy' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7ac701ccd211d0a1b04243e4c0591adb9f1996fc;p=akkoma

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

s3 uploader: force public URIs through media proxy

See merge request pleroma/pleroma!403
---

7ac701ccd211d0a1b04243e4c0591adb9f1996fc