Merge branch 'master' of github.com:designcreateplay/NodeBB

This commit is contained in:
Julian Lam
2014-03-18 15:38:06 -04:00
3 changed files with 18 additions and 21 deletions

View File

@@ -5,7 +5,6 @@ var bcrypt = require('bcryptjs'),
nconf = require('nconf'),
winston = require('winston'),
gravatar = require('gravatar'),
validator = require('validator'),
S = require('string'),
utils = require('./../public/src/utils'),