Commit cbc7527

committed

Fixed conflicts

2 parents fcb03a4 + 8d501ca commit cbc7527Copy full SHA for cbc7527

7 files changed

+1306

-710

lines changed

classes
- Hook.php
config/services
- common.yml
src
- Adapter/Presenter/Product
  - ProductLazyArray.php
- Core/Hook
  - HookModuleFilter.php
  - HookModuleFilterInterface.php
- PrestaShopBundle/Resources/config/services/core
  - common.yml
tests/Integration/Adapter/Presenter/Product
- ProductLazyArrayTest.php

7 files changed

+1306

-710

lines changed

Comments

(0)