3 Commits

Author	SHA1	Message	Date
franck	e3644cd6cc	Aded feature_template and category_template position management	2013-09-21 11:46:09 +02:00
franck	e27b3cfbae	Working catalog branch	2013-09-20 15:54:50 +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