Skip to content
Snippets Groups Projects
Commit d75d4c96 authored by Dmytro Poperechnyy's avatar Dmytro Poperechnyy
Browse files

Merge remote-tracking branch 'tango/MAGETWO-32567' into MAGETWO-31522 

Conflicts:
	app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/View.php
	app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
	app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
	app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
	app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
	app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/View.php
	app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
	dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php
	dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/ViewTest.php
parents 68ab2943 41022c93
Hide whitespace changes
Inline Side-by-side
Showing
with 52 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment