Merge branch 'master' of https://github.com/thelia/thelia into coupon
* 'master' of https://github.com/thelia/thelia: (33 commits) permissions finish contact process create contact form create example for mail usage permission cleanup change place where absolute url is create when rewritten url is enabled fix issue #43 fix typo in product breadcrumb update countries list fix issue #35 fix cartItem updateQuantity method add some verification on country default trigger not allowed to delete default country WIP : admin profiles fiw test suite clear cache when a module is removed end module removal create event object for module delete action update insert script new model ... Conflicts: core/lib/Thelia/Controller/Admin/CouponController.php
This commit is contained in:
@@ -25,7 +25,6 @@ namespace Thelia\Coupon;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Container;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
use Symfony\Component\Translation\Translator;
|
||||
use Symfony\Component\Translation\TranslatorInterface;
|
||||
use Thelia\Condition\ConditionEvaluator;
|
||||
use Thelia\Core\HttpFoundation\Request;
|
||||
|
||||
Reference in New Issue
Block a user