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

12 KiB

Raw Blame History

View Raw