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

Conflicts:
	public/language/en_GB/modules.json
	src/controllers/accounts.js
	src/middleware/middleware.js
	src/routes/index.js
v1.18.x
Julian Lam 11 years ago
commit d18461c8eb

@ -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({

Loading…
Cancel
Save