// same order as product page for getAttributesColorList
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[*] WS : Add product_customization_fields entity #PSCFV-12096
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[-] BO : Fix bug #PSCSX-2658, combinations edition
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[-] INSTALLER: don't launch sessions on smarty compilation to avoid race conditions
// Fixed boulette
// Smarty Cache MySQL improvements
//keep login in url when redirect to adminLogin