Merge branch master into develop

This commit is contained in:
Peter Jaszkowiak
2017-04-12 21:11:39 -06:00
71 changed files with 477 additions and 337 deletions

View File

@@ -104,7 +104,6 @@ function setupConfigs() {
function printStartupInfo() {
if (nconf.get('isPrimary') === 'true') {
winston.info('Time: %s', (new Date()).toString());
winston.info('Initializing NodeBB v%s', nconf.get('version'));
var host = nconf.get(nconf.get('database') + ':host');