From: eal <eal@waifu.club>
Date: Mon, 15 Jan 2018 17:26:41 +0000 (+0000)
Subject: Merge branch 'fix/pleroma.nginx' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=db5dfd1b3eaadb7ecc07cf496c97901f4c8bc7d4;p=akkoma

Merge branch 'fix/pleroma.nginx' into 'develop'

Correct pleroma.nginx

See merge request pleroma/pleroma!46
---

db5dfd1b3eaadb7ecc07cf496c97901f4c8bc7d4