Manuel Raynaud 7bf5ee31c9 Merge branch 'refactor_action' ...

Conflicts:
	core/lib/Thelia/Action/Product.php
	core/lib/Thelia/Controller/Admin/CategoryController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Controller/Admin/TemplateController.php

2013-09-30 10:26:59 +02:00

..

lib/Thelia

Merge branch 'refactor_action'

2013-09-30 10:26:59 +02:00

bootstrap.php

Product loop adjustements

2013-08-01 10:53:35 +02:00