Etienne Roudeix 55a309c00a Merge branch 'master' into loops ...

Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html

2013-07-05 11:16:55 +02:00

..

admin/default

Introduction of loop scopes.

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

default

set execution right // no more troubles

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

smarty-sample

Merge branch 'master' into loops

2013-07-05 11:16:55 +02:00

.gitkeep

set execution right // no more troubles

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