// Uploader helper part 3
// Blockcategories thumnail uploader fix
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap