Etienne Roudeix c0a4b8b987 Merge branch 'master' into rewrite ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Attribute.php
	core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
	core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/Content.php
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Loop/Currency.php
	core/lib/Thelia/Core/Template/Loop/Feature.php
	core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Image.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Loop/Title.php
	core/lib/Thelia/Model/Tools/ModelCriteriaTools.php

2013-08-30 15:02:48 +02:00

..

add-category-dialog.html

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

category_breadcrumb.html

Factorized ModelCriterialTools calls in loops

2013-08-28 19:47:31 +02:00

delete-category-dialog.html

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

footer.inc.html

Added category creation and deletion

2013-08-08 02:39:42 +02:00

header.inc.html

url global substitution

2013-08-30 14:30:33 +02:00

inner-form-toolbar.html

Factorized ModelCriterialTools calls in loops

2013-08-28 19:47:31 +02:00

js.inc.html

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

thelia_news_feed.html

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00