Merge pull request #24 from popcorn-official/revert-23-masterHEADorigin/masterorigin/HEADmaster

Revert "Added CORS on the server"

2 files changed, 1 insertions, 4 deletions

diff --git a/package.json b/package.json
index 5ec3fa2..2a795dc 100644..100755
--- a/package.json
+++ b/package.json
@@ -7,7 +7,6 @@
     "body-parser": "^1.2.0",
     "cheerio": "^0.16.0",
     "compression": "^1.0.2",
-    "cors": "^2.5.3",
     "cron": "^1.0.4",
     "express": "^4.3.0",
     "moment": "^2.6.0",
diff --git a/setup.js b/setup.js
index ccaf67d..864e932 100644
--- a/setup.js
+++ b/setup.js
@@ -2,8 +2,7 @@ var join = require('path').join
   , express = require('express')
   , compress = require('compression')
   , responseTime = require('response-time')
-  , bodyParser = require('body-parser')
-  , cors = require('cors');
+  , bodyParser = require('body-parser');
 
 var mongoose = require('mongoose');
 var config = require('./config');
@@ -41,5 +40,4 @@ module.exports = function(config, app) {
 		memLevel: 3
 	}));
 	app.use(responseTime());
-	app.use(cors());
 }