Commit Graph

3 Commits

Author SHA1 Message Date
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
Manuel Raynaud
fc088fcbd6 start to implement cart creation process 2013-07-24 17:48:10 +02:00
Manuel Raynaud
38e4b6a09d cart is persist now 2013-07-23 16:01:00 +02:00