Manuel Raynaud 376471db04 Merge branch 'cart' ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

2013-08-08 18:03:23 +02:00

..

lib/Thelia

Merge branch 'cart'

2013-08-08 18:03:23 +02:00

bootstrap.php

Product loop adjustements

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