Commit Graph

3 Commits

Author SHA1 Message Date
mespeche
617b762d8a Working : Resize countries flag + Add bootstrap-switch 2013-09-06 10:16:08 +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
franck
64031a1883 Added category creation and deletion 2013-08-08 02:39:42 +02:00