Merge branch 'develop' into MAGETWO-33528 (1e931d86) · Commits · KIII-12 / Magento

Commit 1e931d86 authored 10 years ago by

Michael Logvin

Browse files

Merge branch 'develop' into MAGETWO-33528

parents f4cbc9b5 5445f80e

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Customer/Model/Customer.php 1 addition, 1 deletion

app/code/Magento/Customer/Model/Customer.php
app/code/Magento/Sales/Model/Order.php 4 additions, 1 deletion

app/code/Magento/Sales/Model/Order.php
app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php 2 additions, 1 deletion

...ales/Model/Order/Email/Sender/CreditmemoCommentSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php 2 additions, 3 deletions

...gento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php 2 additions, 1 deletion

...o/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php 2 additions, 3 deletions

.../Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php 2 additions, 1 deletion

...nto/Sales/Model/Order/Email/Sender/OrderCommentSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php 3 additions, 3 deletions

...de/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php 2 additions, 1 deletion

.../Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php 3 additions, 4 deletions

...Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml 1 addition, 1 deletion

...onal/tests/app/Magento/Ups/Test/Repository/ConfigData.xml
dev/tests/integration/testsuite/Magento/ToolkitFramework/_files/small.xml 1 addition, 1 deletion

...ation/testsuite/Magento/ToolkitFramework/_files/small.xml
dev/tools/performance-toolkit/fixtures/cart_price_rules.php 4 additions, 1 deletion

dev/tools/performance-toolkit/fixtures/cart_price_rules.php
dev/tools/performance-toolkit/fixtures/catalog_price_rules.php 4 additions, 1 deletion

...ools/performance-toolkit/fixtures/catalog_price_rules.php
dev/tools/performance-toolkit/fixtures/categories.php 4 additions, 1 deletion

dev/tools/performance-toolkit/fixtures/categories.php
dev/tools/performance-toolkit/fixtures/configs_apply.php 3 additions, 0 deletions

dev/tools/performance-toolkit/fixtures/configs_apply.php
dev/tools/performance-toolkit/fixtures/configurable_products.php 4 additions, 1 deletion

...ls/performance-toolkit/fixtures/configurable_products.php
dev/tools/performance-toolkit/fixtures/customers.php 4 additions, 1 deletion

dev/tools/performance-toolkit/fixtures/customers.php
dev/tools/performance-toolkit/fixtures/eav_variations.php 4 additions, 0 deletions

dev/tools/performance-toolkit/fixtures/eav_variations.php
dev/tools/performance-toolkit/fixtures/orders.php 314 additions, 0 deletions

dev/tools/performance-toolkit/fixtures/orders.php

with 366 additions and 26 deletions

Please register or to comment

Admin message

Merge branch 'develop' into MAGETWO-33528