Merge branch 'master' of https://github.com/richiepreece/NodeBB into richiepreece-master

This commit is contained in:
Baris Soner Usakli
2014-01-26 22:14:04 -05:00
3 changed files with 4 additions and 4 deletions

View File

@@ -1,4 +1,4 @@
var bcrypt = require('bcrypt'),
var bcrypt = require('bcryptjs'),
async = require('async'),
nconf = require('nconf'),
winston = require('winston'),