From: feld <feld@feld.me>
Date: Tue, 9 Jul 2019 16:00:44 +0000 (+0000)
Subject: Merge branch 'proxy-error' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=167f810ff18fdc0271e6908d1d07c2f715e3f34f;p=akkoma

Merge branch 'proxy-error' into 'develop'

make sure the url used by proxy is same as original url

See merge request pleroma/pleroma!1383
---

167f810ff18fdc0271e6908d1d07c2f715e3f34f