Manuel Raynaud 8b2007f94d Merge branch 'actions' ...

Conflicts:
	core/lib/Thelia/Action/Currency.php
	core/lib/Thelia/Core/Event/TheliaEvents.php

2013-09-04 10:53:32 +02:00

..

lib/Thelia

Merge branch 'actions'

2013-09-04 10:53:32 +02:00

bootstrap.php

Product loop adjustements

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