From: lambda <pleromagit@rogerbraun.net>
Date: Tue, 29 May 2018 10:58:43 +0000 (+0000)
Subject: Merge branch 'patch-3' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=8bd7ace4203a06257eda19829a14e17e381724d9;hp=-c;p=akkoma

Merge branch 'patch-3' into 'develop'

Update pleroma.nginx

See merge request pleroma/pleroma!179
---

8bd7ace4203a06257eda19829a14e17e381724d9