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-01-04 11:19:03 +01:00
2013-11-21 17:43:51 +01:00
2013-10-24 18:36:36 +02:00
2013-10-11 18:26:12 +02:00
2011-10-04 16:25:08 +00:00
2013-11-20 15:20:44 +01:00
2013-10-23 12:10:02 +02:00
2013-01-04 11:19:03 +01:00
2013-11-15 18:07:23 +01:00
2013-01-23 15:48:15 +01:00
2013-11-06 12:18:52 +01:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-11-07 21:48:55 +01:00
2013-10-03 11:15:03 +02:00
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-05-27 18:13:13 +02:00
2011-07-06 10:54:11 +00:00
2013-10-28 14:58:19 +01:00
2013-08-29 17:21:27 +02:00
2011-07-06 10:54:11 +00:00
2013-11-14 14:42:35 +01:00
2013-06-26 16:22:57 +02:00
2013-01-04 11:19:03 +01:00
2013-10-25 14:58:10 +02:00
2013-10-10 11:02:33 +02:00
2011-07-06 10:54:11 +00:00
2013-01-04 11:19:03 +01:00
2013-01-23 15:48:15 +01:00
2013-10-04 17:18:23 -07:00
2013-11-20 14:56:31 +01:00
2013-07-05 18:36:42 +02:00
2013-01-04 11:19:03 +01:00
2013-11-06 15:49:44 +01:00
2013-11-04 14:43:01 +01:00
2013-11-05 15:35:14 +01:00