Kevin Granger
9eefcfd058
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/css/modules.css
admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/prices.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
classes/Autoload.php
classes/Carrier.php
classes/Product.php
classes/ProductSale.php
classes/Tools.php
classes/Validate.php
classes/tax/TaxRulesTaxManager.php
controllers/admin/AdminPPreferencesController.php
controllers/admin/AdminPerformanceController.php
install-dev/install_version.php
js/admin_carrier_wizard.js
modules/blockcategories/blockcategories.php
modules/blocklayered/blocklayered.php
modules/statsequipment/statsequipment.php
modules/statsproduct/statsproduct.php
modules/watermark/watermark.php
themes/default/address.tpl
themes/default/authentication.tpl
themes/default/category.tpl
themes/default/contact-form.tpl
themes/default/css/history.css
themes/default/header.tpl
themes/default/js/cart-summary.js
themes/default/js/product.js
themes/default/mobile/order-detail.tpl
themes/default/modules/blocksearch/blocksearch.tpl
themes/default/modules/productcomments/productcomments.tpl
themes/default/order-carrier.tpl
themes/default/order-detail.tpl
themes/default/order-opc-new-account.tpl
themes/default/product.tpl
2013-11-21 17:43:51 +01:00
..
2013-10-15 18:09:53 +02:00
2013-10-08 18:42:07 +02:00
2013-10-25 11:25:13 +02:00
2013-01-04 11:19:03 +01:00
2013-11-06 14:42:56 +01:00
2013-10-24 17:04:55 +02:00
2013-11-13 15:31:30 +01:00
2013-10-15 18:09:53 +02:00
2013-11-20 15:20:44 +01:00
2013-07-26 18:27:21 +02:00
2013-10-31 11:34:47 +01:00
2013-11-06 11:06:46 +01:00
2013-11-04 18:32:59 +01:00
2013-08-26 11:38:10 +02:00
2013-09-24 13:09:22 +02:00
2013-07-31 17:43:48 +02:00
2013-10-31 12:20:29 +01:00
2013-11-04 14:43:01 +01:00
2013-11-21 09:35:44 +01:00
2013-11-15 18:07:23 +01:00
2013-11-20 14:50:31 +01:00
2013-10-23 14:49:22 +02:00
2013-11-21 12:10:15 +01:00
2013-11-13 15:31:30 +01:00
2013-10-08 18:42:07 +02:00
2013-11-21 17:43:51 +01:00
2013-09-13 11:41:14 +02:00
2013-10-22 10:07:03 +02:00
2013-11-20 17:29:35 +01:00
2013-10-17 18:43:15 +02:00
2013-09-06 16:25:01 +02:00
2013-10-15 18:09:53 +02:00
2013-09-13 12:18:27 +02:00
2013-11-20 17:24:52 +01:00
2013-10-15 18:09:53 +02:00
2013-09-26 09:37:38 +02:00
2013-10-15 18:09:53 +02:00
2013-10-08 18:42:07 +02:00
2013-01-04 16:58:58 +01:00
2013-11-21 17:43:51 +01:00
2013-11-20 16:24:01 +01:00
2013-05-15 11:31:55 +02:00
2013-01-04 11:19:03 +01:00
2013-11-21 11:06:08 +01:00
2013-01-04 11:19:03 +01:00
2013-11-05 18:17:39 +01:00
2013-11-21 12:32:51 +01:00
2013-01-04 11:19:03 +01:00
2013-11-21 17:43:51 +01:00
2013-11-04 16:08:38 +01:00
2013-10-15 18:09:53 +02:00
2013-07-26 12:15:23 +02:00
2013-09-18 10:43:58 +02:00
2013-11-07 14:57:13 +01:00
2013-10-15 18:09:53 +02:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-07-26 12:15:23 +02:00
2013-10-31 12:20:29 +01:00
2013-10-31 12:20:29 +01:00
2013-10-28 12:08:46 +01:00
2013-10-09 19:39:05 +02:00
2013-10-15 18:09:53 +02:00
2013-10-15 18:09:53 +02:00
2013-10-15 18:09:53 +02:00
2013-10-25 14:20:42 +02:00
2013-09-18 10:29:04 +02:00
2013-10-15 18:09:53 +02:00
2013-10-15 18:09:53 +02:00
2013-01-04 11:19:03 +01:00
2013-07-26 11:12:50 +02:00
2013-10-29 18:15:17 +01:00
2013-09-26 11:36:28 +02:00
2013-11-04 14:29:31 +01:00
2013-08-27 18:22:54 +02:00
2013-11-20 18:07:51 +01:00
2013-10-15 18:09:53 +02:00
2013-10-01 18:29:35 +02:00
2013-01-04 11:19:03 +01:00