From: kaniini <nenolod@gmail.com>
Date: Tue, 12 Feb 2019 22:41:46 +0000 (+0000)
Subject: Merge branch 'feature/csp_mastofe-dev' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0534463cef059d1af1e90007e13e27207876dd9f;p=akkoma

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
---

0534463cef059d1af1e90007e13e27207876dd9f