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

wtf. Merge remote-tracking branch 'origin/chat-route' into chat-route

Browse Source 
Conflicts:
	public/language/en_GB/modules.json
	src/controllers/accounts.js
	src/middleware/middleware.js
	src/routes/index.js
This commit is contained in:
Julian Lam
2014-07-05 15:46:37 -04:00
parent 89dc8c490a b03bb3a32b
commit d18461c8eb
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/middleware/middleware.js
View File

@@ -227,6 +227,8 @@ middleware.chat.getMessages = function(req, res, next) {
} }
}; };
/* End Chat Middlewares */
middleware.buildHeader = function(req, res, next) { middleware.buildHeader = function(req, res, next) {
res.locals.renderHeader = true; res.locals.renderHeader = true;
async.parallel({ async.parallel({