Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-36037
Showing
- CHANGELOG.md 22 additions, 0 deletionsCHANGELOG.md
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/Authorization/composer.json 3 additions, 3 deletionsapp/code/Magento/Authorization/composer.json
- app/code/Magento/Backend/App/Action/Context.php 6 additions, 1 deletionapp/code/Magento/Backend/App/Action/Context.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php 2 additions, 2 deletions...ento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
- app/code/Magento/Backend/composer.json 18 additions, 18 deletionsapp/code/Magento/Backend/composer.json
- app/code/Magento/Backend/etc/adminhtml/di.xml 18 additions, 0 deletionsapp/code/Magento/Backend/etc/adminhtml/di.xml
- app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml 1 addition, 1 deletion...nto/Backend/view/adminhtml/templates/dashboard/grid.phtml
- app/code/Magento/Backup/composer.json 5 additions, 5 deletionsapp/code/Magento/Backup/composer.json
- app/code/Magento/Bundle/composer.json 17 additions, 17 deletionsapp/code/Magento/Bundle/composer.json
- app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml 2 additions, 1 deletion...templates/product/composite/fieldset/options/bundle.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml 28 additions, 21 deletions...ml/templates/sales/creditmemo/create/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml 2 additions, 2 deletions...html/templates/sales/creditmemo/view/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml 21 additions, 18 deletions...nhtml/templates/sales/invoice/create/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml 2 additions, 2 deletions...minhtml/templates/sales/invoice/view/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml 18 additions, 18 deletions...adminhtml/templates/sales/order/view/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml 6 additions, 3 deletions...html/templates/sales/shipment/create/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml 2 additions, 2 deletions...inhtml/templates/sales/shipment/view/items/renderer.phtml
- app/code/Magento/CacheInvalidate/composer.json 3 additions, 3 deletionsapp/code/Magento/CacheInvalidate/composer.json
- app/code/Magento/Captcha/composer.json 6 additions, 6 deletionsapp/code/Magento/Captcha/composer.json
Please register or sign in to comment