Merge branch 'subscriptions' of github.com:okfocus/vvalls into subscriptions

1 files changed, 20 insertions, 18 deletions

diff --git a/package.json b/package.json
index adefb82..8afb96e 100644
--- a/package.json
+++ b/package.json
@@ -6,32 +6,34 @@
     "url": "git://github.com/okfocus/vvalls.git"
   },
   "dependencies": {
-    "express": "~3.4.8",
-    "monk": "~0.7.1",
-    "socket.io": "~0.9.16",
+    "body-parser": "1.3.0",
     "connect-mongo": "~0.4.1",
-    "passport": "~0.2.0",
-    "passport-local": "~1.0.0",
-    "passport-twitter": "~1.0.2",
-    "passport-facebook": "~1.0.3",
-    "passport.socketio": "~3.0.1",
-    "node-restful": "~0.1.14",
     "ejs": "^0.8.8",
-    "useful-string": "0.0.1",
+    "emailjs": "~0.3.6",
+    "express": "~3.4.8",
     "express-subdomain-handler": "~0.1.0",
     "express-subdomains": "0.0.5",
+    "html-entities": "~1.0.10",
+    "intro.js": "^0.9.0",
+    "knox": "~0.8.10",
     "lodash": "~2.4.1",
+    "marked": "~0.3.2",
+    "moment": "~2.6.0",
     "mongoose": "~3.8.8",
-    "mongoose-unique-validator": "~0.3.0",
     "mongoose-lifecycle": "~1.0.0",
-    "knox": "~0.8.10",
-    "moment": "~2.6.0",
-    "html-entities": "~1.0.10",
+    "mongoose-unique-validator": "~0.3.0",
+    "monk": "~0.7.1",
     "multer": "~0.1.0",
-    "body-parser": "1.3.0",
-    "marked": "~0.3.2",
-    "emailjs": "~0.3.6",
-    "intro.js": "^0.9.0"
+    "node-recurly": "^2.1.0",
+    "node-restful": "~0.1.14",
+    "passport": "~0.2.0",
+    "passport-facebook": "~1.0.3",
+    "passport-local": "~1.0.0",
+    "passport-twitter": "~1.0.2",
+    "passport.socketio": "~3.0.1",
+    "socket.io": "~0.9.16",
+    "useful-string": "0.0.1",
+    "xml2js": "^0.4.4"
   },
   "devDependencies": {
     "grunt": "~0.4.1",