Merge branch 'WindowsFix' of github.com:BitBangersCode/NodeBB into BitBangersCode-WindowsFix

Conflicts:
	src/webserver.js
This commit is contained in:
Julian Lam
2014-01-20 11:08:41 -05:00

View File

@@ -95,7 +95,7 @@ if(nconf.get('ssl')) {
}],
templateValues = {
bootswatchCSS: meta.config['theme:src'],
pluginCSS: plugins.cssFiles.map(function(file) { return { path: nconf.get('relative_path') + file + (meta.config['cache-buster'] ? '?v=' + meta.config['cache-buster'] : '') }; }),
pluginCSS: plugins.cssFiles.map(function(file) { return { path: nconf.get('relative_path') + file.replace(/\\/g, '/') + (meta.config['cache-buster'] ? '?v=' + meta.config['cache-buster'] : '') }; }),
title: meta.config.title || '',
description: meta.config.description || '',
'brand:logo': meta.config['brand:logo'] || '',