// Fixes "Notice: Undefined index: nb_results in"
// Done in 1.5.6.1
//dashconfig errors return
//merge
Merge pull request #939 from djfm/bootstrap

Translations (EN) / Mails / Fix Column
// update bootstrap + add enquire.js
added check for empty value
// better syntax
Merge pull request #940 from PhpMadman/bootstrap

// Fixes "Notice: Undefined index: nb_results in" when searching
// Uploader helper part 3
// Blockcategories thumnail uploader fix
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// link to employee default tab and not index
// This Controller needs a toolbar and a title
// merge fixes
// small fix
// Fix cache problem
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// add 2 useful hooks
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap