Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-09 07:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into webserver.js-refactor

Browse Source 
Conflicts:
	public/templates/accountedit.tpl
	public/templates/header.tpl
	src/routes/meta.js
	src/webserver.js
This commit is contained in:
psychobunny
2014-03-07 19:21:40 -05:00
parent 23e4eb7cd9 c9642cecd2
commit e84dd4fd94
20 changed files with 516 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/middleware/middleware.js
View File

@@ -163,7 +163,6 @@ middleware.renderHeader = function(req, res, callback) {
}],
templateValues = {
bootswatchCSS: meta.config['theme:src'],
pluginCSS: plugins.cssFiles.map(function(file) { return { path: nconf.get('relative_path') + file.replace(/\\/g, '/') }; }),
title: meta.config.title || '',
description: meta.config.description || '',
'brand:logo': meta.config['brand:logo'] || '',