Merge branch 'patch-2' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 14 Jun 2018 07:23:14 +0000 (07:23 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 14 Jun 2018 07:23:14 +0000 (07:23 +0000)
commit678df59d22165ac91d659901fcbefbd6384c6e87
tree20182ab013f08cc687db5506063450723b57ab98
parent2723fb5150f54b30657dd7a0bfa88702bc857173
parent750cfbf38ddc767e48a367697162c9ea6365bc14
Merge branch 'patch-2' into 'develop'

* fix nginx 1.15 warning:

See merge request pleroma/pleroma!213