Manuel Raynaud ea1ee4932d Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Controller/Front/AddressController.php

2013-09-13 12:36:56 +02:00

..

lib/Thelia

Merge branch 'master' into template

2013-09-13 12:36:56 +02:00

bootstrap.php

Product loop adjustements

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