Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Julian Lam
2017-04-12 23:57:14 -04:00
226 changed files with 211 additions and 10501 deletions

View File

@@ -6,7 +6,7 @@ var validator = require('validator');
var winston = require('winston');
var plugins = require('../plugins');
var translator = require('../../public/src/modules/translator');
var translator = require('../translator');
module.exports = function (middleware) {
middleware.processRender = function (req, res, next) {