gRoussac a69d1c6d05 Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug ...

Conflicts:
	controllers/admin/AdminPerformanceController.php
	install-dev/data/xml/configuration.xml

2013-08-06 10:42:44 +02:00

..

css

// Improved label of IETF language tag

2013-07-01 12:35:32 +02:00

img

// With the image

2013-02-25 13:42:55 +01:00

template

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

2013-08-06 10:42:44 +02:00

index.php

// Welcome 2013

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