public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into bures-access

Browse source 
# Conflicts:
#	package.json
This commit is contained in:
witzig 2017-09-26 15:29:49 +02:00
commit 7a93628cc8
10 changed files with 108 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
routes/lists-legacy.js
View file

@ -563,7 +563,7 @@ router.get('/subscription/:id/import/:importId', passport.csrfProtection, (req,
data.list = list;
data.csrfToken = req.csrfToken();
data.customFields = fields.getRow(fieldList, data);
data.customFields = fields.getRow(fieldList, data, false, true);
res.render('lists/subscription/import-preview', data);
});