Merge branch 'refactor_action'
Conflicts: core/lib/Thelia/Action/Product.php core/lib/Thelia/Controller/Admin/CategoryController.php core/lib/Thelia/Controller/Admin/ProductController.php core/lib/Thelia/Controller/Admin/TemplateController.php
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
|
||||
namespace Thelia\Tests\Action;
|
||||
use Thelia\Action\Address;
|
||||
use Thelia\Core\Event\AddressCreateOrUpdateEvent;
|
||||
use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent;
|
||||
use Thelia\Model\Base\CustomerQuery;
|
||||
|
||||
/**
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
namespace Thelia\Tests\Action\ImageTest;
|
||||
use Thelia\Action\Customer;
|
||||
use Thelia\Core\Event\CustomerCreateOrUpdateEvent;
|
||||
use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user