From: kaniini <nenolod@gmail.com>
Date: Sun, 7 Oct 2018 01:10:12 +0000 (+0000)
Subject: Merge branch 'patch-2' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b638cc50b67de8b74a490285aa8504a35e87b646;p=akkoma

Merge branch 'patch-2' into 'develop'

Relax form-action content security policy in sample nginx config

See merge request pleroma/pleroma!364
---

b638cc50b67de8b74a490285aa8504a35e87b646