gRoussac 803b6ce8ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development ...

Conflicts:
	controllers/admin/AdminImportController.php

2013-09-19 16:38:01 +02:00

..

admin

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

2013-09-19 16:38:01 +02:00

front

[-] FO : replace ucfirst by ucwords for the customer firstname #PSCFV-10396

2013-09-16 11:42:11 +02:00

index.php

// Welcome 2013

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