Merge branch 'proxy-error' into 'develop'
authorfeld <feld@feld.me>
Tue, 9 Jul 2019 16:00:44 +0000 (16:00 +0000)
committerfeld <feld@feld.me>
Tue, 9 Jul 2019 16:00:44 +0000 (16:00 +0000)
make sure the url used by proxy is same as original url

See merge request pleroma/pleroma!1383


Trivial merge