Merge branch 'master' of github.com:andris9/mailtrain

This commit is contained in:
Andris Reinman 2017-03-10 14:15:29 +02:00
commit 55d23145a8
3 changed files with 17 additions and 0 deletions

3
app.js
View file

@ -183,6 +183,9 @@ app.use((req, res, next) => {
res.locals.menu = menu;
tools.updateMenu(res);
res.locals.customStyles = config.customstyles || [];
res.locals.customScripts = config.customscripts || [];
settingsModel.list(['ua_code', 'shoutout'], (err, configItems) => {
if (err) {
return next(err);