Kevin Granger
889a2006ec
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/customer_threads/message.tpl
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/favorites.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
admin-dev/themes/default/template/controllers/orders/form.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/associations.tpl
admin-dev/themes/default/template/controllers/products/combinations.tpl
admin-dev/themes/default/template/controllers/products/images.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/referrers/helpers/view/view.tpl
admin-dev/themes/default/template/header.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
classes/ProductSale.php
classes/helper/HelperList.php
controllers/admin/AdminCmsController.php
controllers/admin/AdminCustomersController.php
controllers/admin/AdminMetaController.php
controllers/admin/AdminModulesController.php
controllers/admin/AdminPerformanceController.php
controllers/admin/AdminProductsController.php
controllers/front/ParentOrderController.php
install-dev/theme/views/welcome.phtml
modules/blocknewproducts/blocknewproducts.php
modules/blocktopmenu/blocktopmenu.php
modules/importerosc/importerosc.php
modules/mailalerts/mailalerts.php
modules/shopimporter/shopimporter.php
modules/statsstock/statsstock.php
themes/default/css/product_list.css
2013-11-04 14:43:01 +01:00
..
2013-07-01 15:41:15 +02:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-04-11 18:53:10 +02:00
2013-02-15 10:09:18 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-09-16 11:12:55 +02:00
2013-01-04 11:19:03 +01:00
2013-07-15 22:01:41 +02:00
2013-07-01 23:39:00 +02:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-03-06 18:56:24 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-09-03 17:43:33 +02:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-09-10 01:12:52 +02:00
2013-05-02 15:41:21 +02:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-02-22 17:25:35 +01:00
2013-01-04 11:19:03 +01:00
2013-09-02 16:28:38 +02:00
2013-01-04 11:19:03 +01:00
2013-09-09 00:10:03 +02:00
2013-02-15 10:09:18 +01:00
2013-01-23 16:07:53 +01:00
2013-01-04 11:19:03 +01:00
2013-02-22 17:25:35 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-11-03 01:49:16 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-09-08 18:25:54 +02:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-06-26 18:27:02 +02:00
2013-01-04 11:19:03 +01:00
2013-09-23 15:17:15 +02:00
2013-05-21 16:47:53 +02:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-09-08 18:29:06 +02:00
2013-05-21 17:20:13 +02:00
2013-01-04 11:19:03 +01:00
2013-09-08 23:22:36 +02:00
2013-09-27 17:47:10 +02:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-09-16 15:02:12 +02:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-07-31 16:08:54 +02:00
2013-01-04 11:19:03 +01:00
2013-05-22 12:16:27 +02:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-11-03 14:55:25 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-09-08 18:29:06 +02:00
2013-01-04 11:19:03 +01:00
2013-04-10 10:27:25 +02:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-09-09 00:10:03 +02:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-11-03 01:49:16 +01:00
2013-01-04 11:19:03 +01:00
2012-10-22 12:41:28 +00:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00