Merge branch '2.2-develop-mainline' into ISSUE-12993 (dc641384) · Commits · KIII-12 / Magento

Commit dc641384 authored 7 years ago by

Pavel Bystritsky

Browse files

Merge branch '2.2-develop-mainline' into ISSUE-12993

parents 69cad441 5790c168

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backup/Model/Db.php 1 addition, 0 deletions

app/code/Magento/Backup/Model/Db.php
app/code/Magento/Backup/Model/ResourceModel/Db.php 24 additions, 0 deletions

app/code/Magento/Backup/Model/ResourceModel/Db.php
app/code/Magento/Backup/Model/ResourceModel/Helper.php 36 additions, 0 deletions

app/code/Magento/Backup/Model/ResourceModel/Helper.php
app/code/Magento/Customer/Setup/UpgradeData.php 36 additions, 0 deletions

app/code/Magento/Customer/Setup/UpgradeData.php
app/code/Magento/Customer/etc/module.xml 1 addition, 1 deletion

app/code/Magento/Customer/etc/module.xml
app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml 3 additions, 1 deletion

.../Payment/view/adminhtml/templates/info/substitution.phtml
app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml 5 additions, 8 deletions

...ales/view/frontend/templates/email/creditmemo/items.phtml
app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml 5 additions, 8 deletions

...o/Sales/view/frontend/templates/email/invoice/items.phtml
app/code/Magento/Sales/view/frontend/templates/email/items.phtml 5 additions, 8 deletions

...e/Magento/Sales/view/frontend/templates/email/items.phtml
app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml 5 additions, 8 deletions

.../Sales/view/frontend/templates/email/shipment/items.phtml
app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml 5 additions, 6 deletions

...ales/view/frontend/templates/order/creditmemo/items.phtml
app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml 5 additions, 6 deletions

...o/Sales/view/frontend/templates/order/invoice/items.phtml
app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml 5 additions, 6 deletions

...ales/view/frontend/templates/order/print/creditmemo.phtml
app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml 4 additions, 5 deletions

...o/Sales/view/frontend/templates/order/print/invoice.phtml
app/code/Magento/Shipping/view/frontend/templates/items.phtml 5 additions, 6 deletions

...code/Magento/Shipping/view/frontend/templates/items.phtml
app/code/Magento/Ui/view/base/web/js/form/element/region.js 5 additions, 0 deletions

app/code/Magento/Ui/view/base/web/js/form/element/region.js
app/design/adminhtml/Magento/backend/web/css/source/_structure.less 1 addition, 0 deletions

.../adminhtml/Magento/backend/web/css/source/_structure.less
app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less 10 additions, 0 deletions

...Magento/blank/Magento_Catalog/web/css/source/_module.less
app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less 10 additions, 0 deletions

.../Magento/luma/Magento_Catalog/web/css/source/_module.less
app/design/frontend/Magento/luma/Magento_Newsletter/web/css/source/_module.less 1 addition, 0 deletions

...gento/luma/Magento_Newsletter/web/css/source/_module.less

with 172 additions and 63 deletions

Please register or to comment

Admin message

Merge branch '2.2-develop-mainline' into ISSUE-12993