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

Conflicts:
	admin-dev/themes/default/template/helpers/list/list_header.tpl

2013-11-18 18:39:25 +01:00

..

form

kb was not translatable

2013-11-08 15:33:49 +01:00

help_access

// Welcome 2013

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

list

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

2013-11-18 18:39:25 +01:00

modules_list

// Improved module list view

2013-06-18 15:34:58 +02:00

options

//small fix on helper form && option

2013-09-17 12:18:37 +02:00

view

// Welcome 2013

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

index.php

// Welcome 2013

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

required_fields.tpl

// Welcome 2013

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