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)
commit167f810ff18fdc0271e6908d1d07c2f715e3f34f
treecd72722e65290afa25a5292bdbf8be88da332c8c
parent95c085174dc523f2898f02120d7ff0b120930d91
parente143747445a0cd4f9b34c1b96ab7e87632e21a74
Merge branch 'proxy-error' into 'develop'

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

See merge request pleroma/pleroma!1383