Etienne Roudeix 86b11096ba Merge branch 'master' into loops ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php

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

13 KiB

Executable File

Raw History

View Raw