mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-08 23:15:48 +01:00
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:
@@ -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({
|
||||
|
||||
Reference in New Issue
Block a user