TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,722 Commits 1 Branch 0 Tags
51a307527cffb51e4d95ac868a06dfd661677ed7
Commit Graph

2 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
Etienne Roudeix
2fa19d5ae5 new image and document management 2013-08-12 14:42:20 +02:00