Merge branch 'ckarande-master'

OWASP · Sep 7, 2014 · 4169b0c · 4169b0c
2 parents 10cc6b0 + 9310d6e
commit 4169b0c
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -10,11 +10,19 @@
     "mongodb": "~1.3.9",
     "swig": "~0.14.0",
     "validator": "~1.1.3",
+<<<<<<< HEAD
     "underscore": "latest",
     "grunt": "latest",
     "grunt-cli": "latest",
     "grunt-env": "latest",
     "forever": "latest",
+=======
+    "underscore": "1.5.2",
+    "grunt": "latest",
+    "grunt-cli": "latest",
+    "grunt-env": "latest",
+    "forever": "0.10.9",
+>>>>>>> 648b7f49975e91ce6cdfdabc158002f82c30cf68
     "helmet": "~0.1.2"
   },
   "engines": {
@@ -26,11 +34,11 @@
     "test": "node node_modules/grunt-cli/bin/grunt test"
   },
   "devDependencies": {
-    "grunt-contrib-watch": "latest",
-    "grunt-contrib-jshint": "latest",
-    "grunt-nodemon": "latest",
-    "grunt-concurrent": "latest",
-    "grunt-mocha-test": "latest",
+    "grunt-contrib-watch": "0.5.3",
+    "grunt-contrib-jshint": "0.7.2",
+    "grunt-nodemon": "0.1.2",
+    "grunt-concurrent": "0.4.2",
+    "grunt-mocha-test": "0.8.1",
     "grunt-jsbeautifier": "~0.2.3"
   },
   "repository": "https://github.com/OWASP/NodejsGoat",