diff options
| author | Alex Millar <[email protected]> | 2015-11-13 14:12:08 -0800 |
|---|---|---|
| committer | Alex Millar <[email protected]> | 2015-11-13 14:12:08 -0800 |
| commit | d598822bbebdaa23a4b41c752d990805edd64548 (patch) | |
| tree | f361c05f79f2601253e8332d3d59ed883abf6dfd | |
| parent | b08cf52fffff2ca5d6af2a24aabfc15a106a9bae (diff) | |
| parent | 59780ccc956bbbb429f9bf063c356e66bd112edd (diff) | |
| download | coinos-server-d598822bbebdaa23a4b41c752d990805edd64548.tar.gz coinos-server-d598822bbebdaa23a4b41c752d990805edd64548.zip | |
Merge remote-tracking branch 'asoltys/master'
| -rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index e5505174..b16847b7 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "async": "0.9.0", - "bcrypt": "0.7.8", + "bcryptjs": "^2.3.0", "body-parser": "^1.5.0", "coffee-script": "1.7.1", "connect-assets": "4.0.1", @@ -19,11 +19,11 @@ "express-session": "^1.6.5", "hogan-express": "0.5.2", "less": "1.7.3", + "nodemailer": "~1.2.1", "passport": "0.2.0", "passport-local": "1.0.0", "redis": "0.11.0", "request": "~2.40.0", - "nodemailer": "~1.2.1", "sendgrid": "~1.2.0" }, "devDependencies": { |