Merge remote-tracking branch 'XTUPLE/4_7_x' into 1855

[xtuple] / package.json

diff --git a/package.json b/package.json
index 7e34f7e..88d940f 100644 (file)
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "less": "1.5.0",
     "moment": "2.4.x",
     "nodemailer": "0.3.x",
-    "npm":"1.2.30",
+    "npm":"1.4.x",
     "node-forge": "0.6.x",
     "oauth2orize": "0.1.x",
     "oauth2orize-jwt-bearer": "0.1.x",
@@ -43,7 +43,7 @@
     "underscore": "1.4.x",
     "winston": "0.7.x",
     "underscore.string": "~2.3.3",
-    "ursa": "0.8.x",
+    "xtuple-linguist": "0.1.x",
     "jquery": "~2.1.1"
   },
   "devDependencies": {
@@ -52,6 +52,7 @@
     "html5": "0.3.13",
     "jshint": "2.4.x",
     "zombie": "1.4.x",
+    "nodemon": "~1.0.15",
     "csslint": "~0.10.0"
   },
   "optionalDependencies": {