Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
[-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459
[-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459
[-] FO: Fix cache product features #PSCFV-6138
[-] FO : fixed multishipping crash when too many products and addresses
[-] FO : fixed multishipping crash when too many products and addresses
//added more details in some error messages
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
revert modif on product.js
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
[-] FO : fixed CSS compression when using inline images #PSCFV-5326
[-] Core : do not die in production mode! #PSCFV-5751
[*] MO : crossselling - moved javascript include into header hook.
[-] BO : fixed weight and distance units validation
// Not enough
// Grumpf
[-] BO : fixed weight and distance units validation
[-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes
[-] MO : crossselling - Added in condition to test element is present.
[-] Core: The emails can now be sent with amazon SES when logo is in png