Etienne Roudeix 32f1fb3441 Merge branch 'admin' into loops ...

Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	templates/smarty-sample/category.html

2013-07-03 09:52:06 +02:00

..

assets

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

i18n

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

includes

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

category.html

Merge branch 'admin' into loops

2013-07-03 09:52:06 +02:00

included.html

Introduction of loop scopes.

2013-07-02 19:18:41 +02:00

index.html

Merge branch 'admin' into loops

2013-07-03 09:52:06 +02:00