Kevin Granger b450a9fa80 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 ...

Conflicts:
	themes/default-bootstrap/products-comparison.tpl

2013-12-04 15:48:16 +01:00

..

default

[*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854

2013-11-27 16:20:20 +01:00

default-bootstrap

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

2013-12-04 15:48:16 +01:00

.htaccess

// Merge -> revision 9061

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

debug.tpl

// Welcome 2013

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

index.php

// Welcome 2013

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

live_edit.tpl

[-] Core : fixed smarty escape htmlall > html

2013-11-22 09:47:15 +01:00