[-] BO : Bad return value for AdminCountries::processStatus()
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] MO : Fix bug discount display in mail, manual merge from https://github.com/202-ecommerce/PrestaShop/commit/1d5df338c46aef723d13aef3e213792df6ea92e2