// follow up https://github.com/PrestaShop/PrestaShop/commit/dfbe2d4e4d6ec5a9dafd779e54ce3e3f3a0423a1
//#PSCSX-2088 part2
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// small fix
[*] BO : #PSCSX-2087
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
// small fix
// Submodules updated