From: kaniini <nenolod@gmail.com>
Date: Thu, 25 Apr 2019 23:23:27 +0000 (+0000)
Subject: Merge branch 'feature/mediaproxy-whitelist' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5b2791698c7e09da6a5481f7c024ea8622e9a3c1;p=akkoma

Merge branch 'feature/mediaproxy-whitelist' into 'develop'

Add mediaproxy whitelist capability

Closes #837

See merge request pleroma/pleroma!1095
---

5b2791698c7e09da6a5481f7c024ea8622e9a3c1