Commit 214c2da

Oleksandr Dubovyk

committed

Merge remote-tracking branch 'troll/MAGETWO-53583' into pull-primary

2 parents 4b177e0 + 91b83fc commit 214c2daCopy full SHA for 214c2da

7 files changed

+529

-107

lines changed

app/code/Magento
- Eav
  - Model
    - Entity/Attribute
      - AbstractAttribute.php
    - ResourceModel
      - UpdateHandler.php
  - Test/Unit/Model/Entity/Attribute
    - AbstractAttributeTest.php
- Ui/view/base/web/js/form/element
  - wysiwyg.js
dev/tests/integration/testsuite/Magento
- Catalog
  - Controller/Adminhtml
    - CategoryTest.php
  - _files
    - dropdown_attribute.php
- Eav/Model/ResourceModel
  - UpdateHandlerTest.php

7 files changed

+529

-107

lines changed

Comments

(0)