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

..

controllers

Merge pull request #984 from soware/development

2013-11-18 01:01:00 -08:00

helpers

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

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

content.tpl

// Welcome 2013

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

footer.tpl

// Fixed details

2013-08-27 15:27:51 +02:00

form_submit_ajax.tpl

// Welcome 2013

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

header.tpl

// norms

2013-10-21 16:46:22 +02:00

index.php

// Welcome 2013

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

invalid_token.tpl

// Welcome 2013

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

layout-ajax.tpl

// Welcome 2013

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

layout-export.tpl

[-] BO : Fix bug for csv export

2013-04-24 17:29:36 +02:00

layout.tpl

[-] BO : FixBug Invalid offset when only one error in layout

2013-07-31 09:18:13 +02:00

toolbar.tpl

Fixed admin toolbar save button javascript actions, problem occurred when there were multiple toolbars on one page

2013-11-16 14:59:37 +01:00