TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
673 Commits 1 Branch 0 Tags
86b11096baebaf7a9ee86b650fea13b2b230647f
Commit Graph

5 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
078b1e0d57 apply cs-fixer 2013-08-14 09:29:04 +02:00
Manuel Raynaud
3c18acb3fc don't needed to call Propel Application 2013-07-11 16:49:21 +02:00
Manuel Raynaud
98589cc2b6 generate Model using Propel command in Thelia app 2013-07-11 16:44:18 +02:00
Manuel Raynaud
1a7c9b2fd2 fix test issue 2013-07-11 15:57:26 +02:00