Merge remote-tracking branch 'remotes/origin/develop'

soajs · Jul 19, 2017 · 240f642 · 240f642
2 parents e9e18ca + 30a9eb8
commit 240f642
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "soajs.core.libs",
   "description": "SOAJS core libraries package",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"
@@ -20,7 +20,7 @@
   "dependencies": {
   },
   "devDependencies": {
-    "bcrypt": "*",
+    "bcryptjs": "*",
     "grunt": "^1.0.1",
     "grunt-contrib-jshint": "1.1.0",
     "grunt-jsdoc": "2.1.0",

diff --git a/test/helper.js b/test/helper.js
@@ -6,7 +6,7 @@ var testConsole = {
 	}
 };
 
-var bcrypt = require('bcrypt');
+var bcrypt = require('bcryptjs');
 var request = require("request");
 
 var lib = {