// Changelog updated
// Changelog updated
[-] MO : ix bug #PSCFV-12025, set PS_BLOCK_CART_XSELL_LIMIT to 0
Merge branch 'dev' of https://github.com/PrestaShop/blockcart into dev
[*] : Blockcart new version 1.5
//Version update
Merge branch 'dev'

Conflicts:
	blockcart.php
	config.xml