//dashboard data-chart-line added
//merge
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap