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
This commit is contained in:
Julian Lam
2014-07-05 15:46:37 -04:00

View File

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