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

Conflicts:
	templates/admin/default/categories.html
	templates/admin/default/includes/add-category-dialog.html
	templates/admin/default/includes/delete-category-dialog.html

2013-09-06 16:18:54 +02:00

..

lib/Thelia

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

2013-09-06 16:18:54 +02:00

bootstrap.php

Product loop adjustements

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