// Ignore list updated + fr translations updated
// Ignore list updated (en.php removed)
//small fix
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release