From: kaniini <nenolod@gmail.com>
Date: Mon, 29 Oct 2018 15:28:29 +0000 (+0000)
Subject: Merge branch 'bugfix/mediaproxy-leaks' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=fbbc5fc91970b2dccb2888e343cad42de8a157bb;p=akkoma

Merge branch 'bugfix/mediaproxy-leaks' into 'develop'

twitter/mastodon api: always use mediaproxy URLs in attachments

Closes #329

See merge request pleroma/pleroma!400
---

fbbc5fc91970b2dccb2888e343cad42de8a157bb