From 99253a7745fa4fa054218077a040b0d0cd7cb7aa Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Fri, 9 Jan 2015 15:47:52 -0800
Subject: [PATCH] clean up failed firefox solutions and implement one that
 works

---
 app.js           | 3 ++-
 public/.htaccess | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 public/.htaccess

diff --git a/app.js b/app.js
index 2e4aaeb981..baa56c1cf5 100644
--- a/app.js
+++ b/app.js
@@ -127,7 +127,8 @@ var trusted = [
     'localhost:3000',
     'ws://localhost:3000/',
     'http://localhost:3000',
-    '*.ionicframework.com'
+    '*.ionicframework.com',
+    'https://syndication.twitter.com'
 ];
 
 debug(trusted);
diff --git a/public/.htaccess b/public/.htaccess
deleted file mode 100644
index 0a72a55ebf..0000000000
--- a/public/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-<FilesMatch ".(ttf|otf|eot|woff)$">
-  <IfModule mod_headers.c>
-    Header set Access-Control-Allow-Origin "*"
-  </IfModule>
-</FilesMatch>
\ No newline at end of file