Merge branch 'master' into soon

2017-01-26 16:34:07 +01:00 · 2017-01-26 16:34:07 +01:00 · 47b437614e
commit 47b437614e
parent 69fb8b4d2f 4402ea9966
1 changed files with 1 additions and 1 deletions
--- a/config.js.dist
+++ b/config.js.dist
@ -17,7 +17,7 @@ module.exports = {
 /*
    httpHeaders: {
        "Content-Security-Policy": [
-            "default-serc 'none'",
+            "default-src 'none'",
            "style-src 'unsafe-inline' 'self'",
            "script-src 'self' 'unsafe-eval' 'unsafe-inline'",
            "child-src 'self' cryptpad.fr *.cryptpad.fr",