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

Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php

2013-09-18 00:35:48 +02:00

..

routing

Merge branch 'master' into template

2013-09-17 20:14:17 +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-18 00:35:48 +02:00

routing.xml

remove isntall routing and template

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