Merge branch 'master' into ux-improvements

Conflicts: views/bonfire/show.jade
2015-02-22 15:26:22 -08:00
parent 5a68ac5411 3833053221
commit 67ff808734
4 changed files with 30 additions and 6 deletions
--- a/app.js
+++ b/app.js
@@ -144,7 +144,8 @@ var trusted = [
    'https://*.togetherjs.com',
    'wss://hub.togetherjs.com',
    '*.ytimg.com',
-    'wss://fcctogether.herokuapp.com'
+    'wss://fcctogether.herokuapp.com',
+    '*.bitly.com'
 ];

 app.use(helmet.contentSecurityPolicy({