Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp

2015-03-17 17:58:01 -07:00
parent a52ab83757 ac6dcf1657
commit a36f978856
1 changed files with 2 additions and 0 deletions
--- a/app.js
+++ b/app.js
@ -135,6 +135,7 @@ var trusted = [
    '*.rafflecopter.com',
    '*.bootstrapcdn.com',
    '*.cloudflare.com',
+    'https://*.cloudflare.com',
    'localhost:3001',
    'ws://localhost:3001/',
    'http://localhost:3001',
@ -145,6 +146,7 @@ var trusted = [
    'https://syndication.twitter.com',
    '*.youtube.com',
    '*.jsdelivr.net',
+    'https://*.jsdelivr.net',
    '*.togetherjs.com',
    'https://*.togetherjs.com',
    'wss://hub.togetherjs.com',