Merge remote-tracking branch 'colinskow/master'

colinskow · Nov 23, 2016 · be82189 · be82189
2 parents 1d52731 + 2c57832
commit be82189
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/util.js b/lib/util.js
@@ -2,7 +2,7 @@
 
 var BPromise = require('bluebird');
 var URLSafeBase64 = require('urlsafe-base64');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 var pwd = require('couch-pwd');
 var crypto = require('crypto');
 

diff --git a/package.json b/package.json
@@ -39,7 +39,6 @@
     "express": "^4.13.3",
     "extend": "^3.0.0",
     "fs-extra": "^0.30.0",
-    "node-uuid": "^1.4.3",
     "nodemailer": "^2.3.0",
     "nodemailer-stub-transport": "^1.0.0",
     "passport": "^0.3.2",
@@ -50,7 +49,8 @@
     "redis": "^2.5.2",
     "sofa-model": "^0.2.0",
     "superagent": "^1.2.0",
-    "urlsafe-base64": "1.0.0"
+    "urlsafe-base64": "1.0.0",
+    "uuid": "^3.0.0"
   },
   "devDependencies": {
     "body-parser": "^1.9.2",