Kevin Granger 8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

Conflicts:
	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/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.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/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php

2013-09-30 11:01:23 +02:00

..

img

// Welcome 2013

2013-01-04 11:19:03 +01:00

translations

[-] Core: delete lang files

2013-03-21 14:15:55 +01:00

ajax-cart.js

[-] MO : PNM-1715 - Bug fix accented chars & ajax-cart

2013-09-19 17:31:35 +02:00

blockcart-ajax.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

blockcart-json.tpl

// W3C

2013-06-06 15:27:29 +02:00

blockcart-set-collapse.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

blockcart.css

[-] FO: fixed bug shopping cart price misplaced - #9971

2013-08-05 10:21:46 +02:00

blockcart.php

//blockcart is now using bootstrap design

2013-09-20 11:24:16 +02:00

blockcart.tpl

// W3C validation error

2013-08-09 18:49:47 +02:00

config.xml

// Config files were translated in french

2013-08-20 17:49:05 +02:00

index.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

logo.gif

2011-07-06 10:54:11 +00:00

logo.png

// new icon for adminhome, adminmodules and header

2011-11-21 09:21:26 +00:00