Etienne Roudeix 0050d01278 Merge branch 'tax' ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php

2013-09-11 08:35:23 +02:00

..

lib/Thelia

Merge branch 'tax'

2013-09-11 08:35:23 +02:00

bootstrap.php

Product loop adjustements

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