From: kaniini <nenolod@gmail.com>
Date: Fri, 30 Nov 2018 18:15:44 +0000 (+0000)
Subject: Merge branch 'feature/reverse-proxy' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=ca24ad2a2babed0700a38effb74910008d58f6ea;p=akkoma

Merge branch 'feature/reverse-proxy' into 'develop'

reverse proxy / uploads

See merge request pleroma/pleroma!470
---

ca24ad2a2babed0700a38effb74910008d58f6ea