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
..
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-02-03 12:09:28 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2012-01-26 17:35:54 +00:00
2013-05-22 12:29:20 +02:00
2012-04-06 14:18:25 +00:00
2012-04-06 14:18:25 +00:00
2012-04-17 15:07:35 +00:00
2012-09-07 08:32:07 +00:00
2013-09-08 17:29:00 +02:00
2013-07-01 23:39:00 +02:00
2013-09-23 15:17:15 +02:00
2012-01-26 17:35:54 +00:00
2012-02-14 16:54:22 +00:00
2012-05-20 10:10:21 +00:00
2013-09-23 15:17:15 +02:00
2012-06-18 14:10:25 +00:00
2012-03-08 17:21:23 +00:00
2012-04-13 15:27:08 +00:00
2013-09-08 17:29:00 +02:00
2012-04-30 16:41:09 +00:00
2012-08-16 09:59:35 +00:00
2013-04-11 18:53:10 +02:00
2012-07-23 10:55:35 +00:00
2012-11-23 15:13:22 +01:00
2012-08-23 14:36:52 +00:00
2012-09-13 13:16:44 +00:00
2013-09-23 15:17:15 +02:00
2012-10-22 12:41:28 +00:00
2013-09-23 15:17:15 +02:00
2013-09-23 15:17:15 +02:00
2013-07-15 12:29:51 +02:00
2013-04-11 18:53:10 +02:00
2013-10-31 19:24:41 +01:00
2013-10-07 10:53:03 +02:00
2013-10-30 20:06:47 +01:00
2013-10-23 15:37:43 +02:00
2013-01-04 11:19:03 +01:00