Commit Graph

5 Commits

Author SHA1 Message Date
Manuel Raynaud
d23190303c refactor name for updating actions 2013-09-04 10:48:59 +02:00
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
ba36a5af60 update api documentation 2013-08-16 10:11:49 +02:00
Manuel Raynaud
cdf28e66cf fix typo in method name 2013-08-09 09:14:25 +02:00
Manuel Raynaud
df371355b9 change phpdoc api generator to phpdoc 2013-08-08 13:26:49 +02:00