mespeche 2f351fd4d9 Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CustomerController.php
	templates/admin/default/customers.html

2013-09-11 10:26:56 +02:00

..

AdminController.php

Completed the backoffice variable management

2013-09-02 00:17:27 +02:00

AttributeController.php

fix cs

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

BaseAdminController.php

searching route return relative path

2013-09-11 09:48:41 +02:00

CategoryController.php

fix cs

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

ConfigController.php

fix cs

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

CouponController.php

fix cs

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

CurrencyController.php

fix cs

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

CustomerController.php

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-11 10:26:56 +02:00

MessageController.php

fix cs

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

SessionController.php

fix cs

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