From: feld <feld@feld.me>
Date: Fri, 2 Aug 2019 17:07:09 +0000 (+0000)
Subject: Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5eec0abe09ad49ffe7ff986ab28f54bddd6f3499;p=akkoma

Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'

Fix/mediaproxy whitelist base url

See merge request pleroma/pleroma!1486
---

5eec0abe09ad49ffe7ff986ab28f54bddd6f3499