Kevin Granger
c7ec33f062
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/css/admin.css
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/home/content.tpl
admin-dev/themes/default/template/controllers/localization/content.tpl
admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
admin-dev/themes/default/template/controllers/orders/_new_product.tpl
admin-dev/themes/default/template/controllers/orders/_product_line.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
admin-dev/themes/default/template/footer.tpl
controllers/admin/AdminCarrierWizardController.php
controllers/admin/AdminCarriersController.php
controllers/admin/AdminCmsController.php
controllers/admin/AdminLocalizationController.php
controllers/admin/AdminManufacturersController.php
controllers/admin/AdminSuppliersController.php
css/admin.css
js/admin-products.js
js/admin_carrier_wizard.js
translations/fr.gzip
2013-09-13 11:41:14 +02:00
..
2013-01-04 11:19:03 +01:00
2013-01-04 11:19:03 +01:00
2013-03-14 17:01:16 +01:00
2013-01-04 11:19:03 +01:00
2013-02-28 17:54:51 +01:00
2013-02-25 17:36: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-09-12 19:26:38 +02:00
2013-09-09 15:11:55 +02:00
2013-08-29 16:39:45 +02:00
2013-01-04 11:19:03 +01:00
2013-03-25 12:12:38 +01:00
// fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv, mk, fa, sk, sr, si, th, ur, tr, uk
2013-03-20 14:13:37 +01:00
2011-07-06 10:54:11 +00:00
2013-01-04 11:19:03 +01:00