Kevin Granger
67dc7aac04
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/filters.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/orders/form.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
classes/Category.php
classes/controller/AdminController.php
controllers/admin/AdminAttributesGroupsController.php
controllers/admin/AdminFeaturesController.php
controllers/admin/AdminImportController.php
controllers/admin/AdminLogsController.php
install-dev/install_version.php
install-dev/langs/ru/data/tab.xml
js/admin_carrier_wizard.js
modules/loyalty/loyalty.php
2013-10-14 12:21:29 +02:00
..
2013-10-04 18:32:31 +02:00
2013-09-24 12:21:10 +02:00
2013-08-13 16:22:38 +02:00
2013-06-07 18:08:29 +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-06-06 15:27:29 +02:00
2013-06-06 15:27:29 +02:00
2013-08-06 11:45:29 +02:00
2013-10-04 18:32:31 +02:00
2013-08-13 16:45:40 +02:00
2013-01-04 11:19:03 +01:00
2013-06-06 15:27:29 +02:00
2013-06-07 17:49:24 +02:00
2013-06-07 17:49:24 +02:00
2013-06-06 15:27:29 +02:00
2013-06-06 15:27:29 +02:00
2013-06-06 15:27:29 +02:00
2013-06-07 17:49:24 +02:00
2013-08-06 19:05:08 +02:00
2013-10-04 18:32:31 +02:00
2013-10-11 16:37:26 +02:00