diff options
author | Houssam Haidar <haidar647@gmail.com> | 2016-11-28 00:31:02 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-28 00:31:02 -0500 |
commit | c0f04e9dafbdd8512db2d424645decb9f4994ac4 (patch) | |
tree | a89bab18556f98bb99bb76d0756013238476690b | |
parent | d483645b9d89e9ff0460317ffd504b5b689699bd (diff) | |
parent | f9ce0aa6657230dffe3e69c94e0082ca88c4c1ed (diff) | |
download | lets-chat-origin/master.zip lets-chat-origin/master.tar.gz lets-chat-origin/master.tar.bz2 |
Merge pull request #723 from marcbachmann/update-uuidHEADorigin/masterorigin/HEADmaster
Update uuid to version 3.0.0
-rw-r--r-- | app/core/presence/connection.js | 2 | ||||
-rw-r--r-- | package.json | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/core/presence/connection.js b/app/core/presence/connection.js index ab196fb..7368e4d 100644 --- a/app/core/presence/connection.js +++ b/app/core/presence/connection.js @@ -2,7 +2,7 @@ var EventEmitter = require('events').EventEmitter, util = require('util'), - uuid = require('node-uuid'); + uuid = require('uuid'); function Connection(type, user) { diff --git a/package.json b/package.json index f9f6a56..f7b403d 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,6 @@ "mongoose-unique-validator": "^1.0.2", "mongoose-validate": "0.0.5", "multer": "^1.1.0", - "node-uuid": "^1.4.7", "node-xmpp-server": "^2.2.0", "node_hash": "^0.2.0", "nunjucks": "^2.4.2", @@ -91,7 +90,8 @@ "passport-local": "1.0.0", "passport.socketio": "3.6.2", "require-directory": "~2.1.1", - "require-tree": "^1.1.1" + "require-tree": "^1.1.1", + "uuid": "^3.0.0" }, "devDependencies": { "eslint": "^3.1.1", |