Merge branch 'cart'

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
This commit is contained in:
Manuel Raynaud
2013-08-08 18:03:23 +02:00
5 changed files with 202 additions and 123 deletions

View File

@@ -24,7 +24,7 @@
<loop class="Thelia\Core\Template\Loop\Title" name="title"/>
<loop class="Thelia\Core\Template\Loop\Lang" name="lang"/>
<loop class="Thelia\Core\Template\Loop\CategoryTree" name="category-tree"/>
<loop class="Thelia\Core\Template\Loop\Cart" name="cart"/>
</loops>
<forms>