From: feld <feld@feld.me>
Date: Fri, 30 Aug 2019 15:23:15 +0000 (+0000)
Subject: Merge branch 'iss-930-media' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6d33c89c4d27a1b52e69e1c14b408726410a6326;p=akkoma

Merge branch 'iss-930-media' into 'develop'

Fix missing changes in pleroma/pleroma!1197

See merge request pleroma/pleroma!1613
---

6d33c89c4d27a1b52e69e1c14b408726410a6326