Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Julian Lam
2017-02-25 21:43:50 -05:00
23 changed files with 3096 additions and 793 deletions

View File

@@ -79,7 +79,6 @@ module.exports.listen = function (callback) {
};
function initializeNodeBB(callback) {
winston.info('initializing NodeBB ...');
var middleware = require('./middleware');
async.waterfall([