4 Commits

Author	SHA1	Message	Date
Manuel Raynaud	a5cfcf91ca	update changelog and fix cs	2014-02-22 19:01:37 +01:00
Franck Allimant	5bf51dd47e	Merge branch 'catalog' ... Conflicts: core/lib/Thelia/Config/Resources/config.xml core/lib/Thelia/Config/Resources/routing/admin.xml core/lib/Thelia/Core/Template/Loop/Country.php core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php core/lib/Thelia/Model/Country.php core/lib/Thelia/Model/Profile.php core/lib/Thelia/Model/ProfileQuery.php install/insert.sql install/thelia.sql local/config/schema.xml	2013-10-24 00:16:33 +02:00
Franck Allimant	7ca2399573	Worked on catalog	2013-10-23 23:47:44 +02:00
Etienne Roudeix	f564db2a8b	WIP : admin profiles	2013-10-21 11:44:33 +02:00