2 Commits

Author	SHA1	Message	Date
gmorel	5846a5f288	Working : Upload management : on folder, category, product	2013-09-23 11:55:02 +02:00
franck	e672677748	Merge branch 'master' of https://github.com/thelia/thelia ... Conflicts: templates/admin/default/category-edit.html	2013-09-19 17:27:46 +02:00