From: kaniini <nenolod@gmail.com>
Date: Tue, 28 May 2019 06:49:54 +0000 (+0000)
Subject: Merge branch 'respect-proxy-settings-federation' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b949a37ef52a3a7c51f5863cf80afcb8ac1ba36f;p=akkoma

Merge branch 'respect-proxy-settings-federation' into 'develop'

Respect proxy settings federation

See merge request pleroma/pleroma!1206
---

b949a37ef52a3a7c51f5863cf80afcb8ac1ba36f