Manuel Raynaud 7e5c296fb2 Merge branch 'cart' ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php

2013-08-08 10:11:22 +02:00

..

Thelia

Merge branch 'cart'

2013-08-08 10:11:22 +02:00