gRoussac d55f31d3b5 Merge branch 'tools-fileAttachment' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-tools-fileAttachment ...

Conflicts:
	classes/Tools.php
	controllers/front/ContactController.php

2013-07-17 15:35:18 +02:00

..

admin

[-] BO : Fix bug #PSCFV-9722, do not propose adding root categories in categories when there is only one shop

2013-07-16 19:01:05 +02:00

front

Merge branch 'tools-fileAttachment' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-tools-fileAttachment

2013-07-17 15:35:18 +02:00

index.php

// Welcome 2013

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