Merge branch 'respect-proxy-settings-federation' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 28 May 2019 06:49:54 +0000 (06:49 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 28 May 2019 06:49:54 +0000 (06:49 +0000)
commitb949a37ef52a3a7c51f5863cf80afcb8ac1ba36f
treec5403dc6c976c03674274580bb55f4e3591f08ec
parent5bb843ceece57cd88e8615b4a4519d2b40309295
parent9f3bcf0efe7fa06e2b8970386c099c1ea2974d0a
Merge branch 'respect-proxy-settings-federation' into 'develop'

Respect proxy settings federation

See merge request pleroma/pleroma!1206