From: lambda <pleromagit@rogerbraun.net>
Date: Tue, 30 Jan 2018 08:16:31 +0000 (+0000)
Subject: Merge branch 'pr-upstream-http-proxy' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2f23ae5b684a363b6090a45c4b1b9685c9ed614a;p=akkoma

Merge branch 'pr-upstream-http-proxy' into 'develop'

Pr upstream http proxy

See merge request pleroma/pleroma!43
---

2f23ae5b684a363b6090a45c4b1b9685c9ed614a