Merge branch 'patch-2' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 7 Oct 2018 01:10:12 +0000 (01:10 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 7 Oct 2018 01:10:12 +0000 (01:10 +0000)
Relax form-action content security policy in sample nginx config

See merge request pleroma/pleroma!364


Trivial merge