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

2012-12-13 09:41:32 +01:00

..

default

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

2012-12-13 09:41:32 +01:00

.htaccess

// Merge -> revision 9061

2011-10-05 15:21:55 +00:00

debug.tpl

//remove svn keyword @version Release: $

2012-11-22 11:57:40 +01:00

index.php

//remove svn keyword @version Release: $

2012-11-22 11:57:40 +01:00

live_edit.tpl

// fix js arg missing for translations in javascript

2012-12-12 19:07:29 +01:00