Merge branch 'master' into develop

This commit is contained in:
Julian Lam
2017-02-23 12:32:03 -05:00
51 changed files with 1297 additions and 771 deletions

View File

@@ -103,9 +103,9 @@ function initializeNodeBB(callback) {
},
function (next) {
async.series([
async.apply(meta.sounds.init),
async.apply(languages.init),
async.apply(meta.blacklist.load)
meta.sounds.addUploads,
languages.init,
meta.blacklist.load,
], next);
}
], callback);