Skip to content
Snippets Groups Projects
Commit d81dbb1f authored by Joan He's avatar Joan He
Browse files

Merge remote-tracking branch 'upstream/develop' into MAGETWO-48081-copyright 

# Conflicts:
#	app/code/Magento/Bundle/Model/Product/Attribute/Source/Price/Type.php
#	app/code/Magento/Bundle/Test/Unit/Model/Product/Attribute/Source/Price/TypeTest.php
#	app/code/Magento/ConfigurableProduct/view/adminhtml/requirejs-config.js
#	app/code/Magento/ConfigurableProduct/view/adminhtml/web/catalog/product/attribute.js
#	app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/advanced-pricing-handler.js
#	app/code/Magento/Downloadable/Setup/UpgradeData.php
parents 1d2e0bca 432b39be
Branches
Hide whitespace changes
Inline Side-by-side
Showing
with 1096 additions and 591 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