Manuel Raynaud d6e26e428e Merge branch 'master' into frontend ...

Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	templates/admin/default/tax-rule-edit.html
	templates/admin/default/taxes-rules.html

2013-10-18 16:41:39 +02:00

..

asides

Creation of Content page

2013-10-18 10:51:52 +02:00

categories-filters.html

allow to order products on category page

2013-09-20 13:59:51 +02:00

menu.html

fix menu when child > 0

2013-10-16 11:45:18 +02:00

mini-cart.html

Empty cart + Intl

2013-10-16 15:13:04 +02:00

single-product.html

Add button "add product to cart"

2013-10-18 10:55:47 +02:00

toolbar.html

Rename category-toolbar to toolbar

2013-10-11 13:12:38 +02:00