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

..

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

product lopp

2013-07-05 11:12:51 +02:00

connexion.html

fiw non saving customer title

2013-07-02 15:00:34 +02:00

included.html

Introduction of loop scopes.

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

index.html

end propel 2 migration

2013-07-05 09:43:49 +02:00