Kevin Granger b61528057a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

Conflicts:
	admin-dev/themes/default/js/admin-theme.js

2013-10-11 11:28:44 +02:00

..

vendor

// kpi orders

2013-09-16 11:45:02 +02:00

admin-theme.js

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-10-11 11:28:44 +02:00

date-range-picker.js

// cleaned admin-theme.js - added date range picker

2013-10-11 11:18:27 +02:00

tree.js

// tree view product

2013-09-09 18:12:31 +02:00