Etienne Roudeix 3b433a0c8d Merge branch 'master' into tax ...

Conflicts:
	templates/default_save/product.html

2013-09-10 19:15:15 +02:00

..

assets

start integration default template

2013-09-09 17:30:18 +02:00

i18n

start integration default template

2013-09-09 17:30:18 +02:00

includes

start integration default template

2013-09-09 17:30:18 +02:00

404.html

start integration default template

2013-09-09 17:30:18 +02:00

address_edit.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00

address_list.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00

address.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00

cart.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00

category.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00

connexion.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00

customer.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00

debug.html

start integration default template

2013-09-09 17:30:18 +02:00

delivery_list.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00

folder.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00

images.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00

included.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00

index.html

start integration default template

2013-09-09 17:30:18 +02:00

login.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00

myaccount.html

start integration default template

2013-09-09 17:30:18 +02:00

pagination.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00

product.html

Merge branch 'master' into tax

2013-09-10 19:15:15 +02:00

tester.html

replace smarty variable identifier by $

2013-09-10 16:54:13 +02:00