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

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

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

..

AddressController.php

Merge branch 'master' into template

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

BaseFrontController.php

allow to make an address as default on update action

2013-09-13 10:17:45 +02:00

CartController.php

fix cs

2013-09-11 08:27:40 +02:00

CustomerController.php

update customer general info

2013-09-12 11:24:24 +02:00

DefaultController.php

fix cs

2013-09-11 08:27:40 +02:00

DeliveryController.php

fix cs

2013-09-11 08:27:40 +02:00