// small fixes in English Email php templates
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// fixed links in new English mails
Merge pull request #892 from djfm/bootstrap

// small fixes in English Email php templates