// fixed order confirmation template - PSCSX-386
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge pull request #1274 from djfm/1.6

// fixed order confirmation template - PSCSX-386