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)
commitb638cc50b67de8b74a490285aa8504a35e87b646
tree85d0bbb911881834cc01be982678ae42508f5b3e
parenta15eac05a65d04b985505e0a284fe861a1da270d
parenta32e013909c1871987ac1a9000ed73b8d1950073
Merge branch 'patch-2' into 'develop'

Relax form-action content security policy in sample nginx config

See merge request pleroma/pleroma!364