Merge branch 'add-manifest-src-to-csp' into 'develop'
authorHaelwenn <git.pleroma.social@hacktivis.me>
Mon, 26 Nov 2018 19:56:49 +0000 (19:56 +0000)
committerHaelwenn <git.pleroma.social@hacktivis.me>
Mon, 26 Nov 2018 19:56:49 +0000 (19:56 +0000)
commit3370924b8ba87354249182694cfa3b598a66e6de
tree83b89af74c122e4cc68cd65dcf376fe7d0f75758
parent39a3b1724ad5bf5828142d4e83d7cb2bbb45a0d9
parent591b11eafcc49a7812390a03d29596b4a96ad5f8
Merge branch 'add-manifest-src-to-csp' into 'develop'

Add manifest-src to CSP to allow manifest.json

See merge request pleroma/pleroma!474