franck 162084140e Merge remote-tracking branch 'origin/master' into admin ...

Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php

2013-07-06 10:34:09 +02:00

1.6 KiB

Executable File

Raw Blame History

View Raw