// Fix missing page header in combinations generator
// Live is deprecated in jquery 1.9
// Fix bug JQuery on handler
Merge pull request #936 from TMMeilleur/bootstrap

// improved  scss variables
// English emails
// Repairs sake of performance on tables with many lines.
// fixs highlight search
// Fixes "Notice: Undefined index: nb_results in"
// sprintf
Merge branch 'bootstrap' of https://github.com/djfm/PrestaShop into bootstrap
// Done in 1.5.6.1
// English
//dashconfig errors return
//merge
// one is one
// English
// English
Merge branch 'bootstrap' of https://github.com/djfm/PrestaShop into bootstrap
// allow hook exceptions on product comparison page
Merge pull request #939 from djfm/bootstrap

Translations (EN) / Mails / Fix Column