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:
@@ -30,9 +30,9 @@ use Thelia\Model\FeatureAv as FeatureAvModel;
|
||||
|
||||
use Thelia\Core\Event\TheliaEvents;
|
||||
|
||||
use Thelia\Core\Event\FeatureAvUpdateEvent;
|
||||
use Thelia\Core\Event\FeatureAvCreateEvent;
|
||||
use Thelia\Core\Event\FeatureAvDeleteEvent;
|
||||
use Thelia\Core\Event\Feature\FeatureAvUpdateEvent;
|
||||
use Thelia\Core\Event\Feature\FeatureAvCreateEvent;
|
||||
use Thelia\Core\Event\Feature\FeatureAvDeleteEvent;
|
||||
use Thelia\Model\ConfigQuery;
|
||||
use Thelia\Core\Event\UpdatePositionEvent;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user