Francois Gaillard 77b2b4b6ca // Manual merge PS 1.5.6.0

2013-10-07 18:22:55 +02:00

..

AdminController.php

// Manual merge PS 1.5.6.0

2013-10-07 18:22:55 +02:00

Controller.php

[-] CORE fixed bug #PSCFV-10595 - small fix in function addJqueryPlugin()

2013-10-07 10:01:26 +02:00

FrontController.php

Merge branch 'development' of github.com:202-ecommerce/PrestaShop into development

2013-10-02 14:38:44 +02:00

index.php

// Welcome 2013

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

ModuleAdminController.php

// Bug fix template override & admin templates

2013-08-06 11:13:49 +02:00

ModuleFrontController.php

// report of https://github.com/PrestaShop/PrestaShop/commit/9b627bf9a28ffc2ce2a0b55bb88af0dd59544c55

2013-09-30 19:18:08 +02:00