Manuel Raynaud b1517945f4 Merge branch 'modules' ...

Conflicts:
	core/lib/Thelia/Controller/Admin/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Thelia.php

2013-11-06 14:37:31 +01:00

..

AddressController.php

Delete address with ajax callback function address.delete()

2013-11-05 17:33:55 +01:00

BaseFrontController.php

Merge branch 'modules'

2013-11-06 14:37:31 +01:00

CartController.php

fix cs

2013-10-25 10:07:21 +02:00

ContactController.php

fix cs

2013-10-25 10:07:21 +02:00

CouponController.php

fix cs

2013-10-25 10:07:21 +02:00

CustomerController.php

Profile and Useful was misspelled

2013-11-04 16:35:01 +01:00

DefaultController.php

fix cs

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

Mail.php

fix cs

2013-10-25 10:07:21 +02:00

NewsletterController.php

fix cs

2013-10-25 10:07:21 +02:00

OrderController.php

small fix

2013-10-24 19:49:52 +02:00