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

..

routing

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-19 17:27:46 +02:00

action.xml

Started product management

2013-09-17 17:15:15 +02:00

config.xml

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-19 16:50:08 +02:00

routing.xml

remove isntall routing and template

2013-09-17 16:30:15 +02:00