Files
PrestaShop/install-dev/upgrade/sql
Kevin Granger 8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
2013-09-30 11:01:23 +02:00
..
2012-01-26 17:35:54 +00:00
2012-02-03 12:09:28 +00:00
2012-04-17 15:07:35 +00:00
2012-09-07 08:32:07 +00:00
2012-02-22 17:25:04 +00:00
2012-06-18 14:10:25 +00:00
2012-04-30 16:41:09 +00:00
2012-10-22 12:41:28 +00:00
2013-01-02 12:00:57 +01:00
2013-09-04 11:14:45 +02:00
2013-09-27 17:47:10 +02:00
2013-01-04 11:19:03 +01:00