Merge branch 'feature/csp_mastofe-dev' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 12 Feb 2019 22:41:46 +0000 (22:41 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 12 Feb 2019 22:41:46 +0000 (22:41 +0000)
commit0534463cef059d1af1e90007e13e27207876dd9f
treea7bcf49690e6871599d3f26c0448a206359263e0
parentc71b3a1b124f5dba23ebe812289868aa4983d8a8
parentda4c662af31a2c45c767f2a9ed136272ee9fc2c8
Merge branch 'feature/csp_mastofe-dev' into 'develop'

Add CSP for mastofe development, remove secure-cookies in MIX_ENV=dev

See merge request pleroma/pleroma!820