gRoussac c9d2cf8ed2 Merge branch 'translate' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-translate ...

Conflicts:
	admin-dev/header.inc.php

2013-07-17 16:31:49 +02:00

..

admin

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

2013-07-17 16:31:49 +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