From: lambda <pleromagit@rogerbraun.net>
Date: Thu, 14 Jun 2018 07:23:14 +0000 (+0000)
Subject: Merge branch 'patch-2' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=678df59d22165ac91d659901fcbefbd6384c6e87;p=akkoma

Merge branch 'patch-2' into 'develop'

* fix nginx 1.15 warning:

See merge request pleroma/pleroma!213
---

678df59d22165ac91d659901fcbefbd6384c6e87