Merge branch 'develop' into FearlessKiwis-MAGETWO-54779-Watermarks-cant-be-set-mainline
Showing
- app/code/Magento/CatalogImportExport/Model/Export/Product.php 8 additions, 0 deletions...code/Magento/CatalogImportExport/Model/Export/Product.php
- app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php 23 additions, 0 deletions...gento/CatalogImportExport/Model/Import/Product/Option.php
- composer.lock 59 additions, 59 deletionscomposer.lock
- dev/tests/functional/composer.json 1 addition, 1 deletiondev/tests/functional/composer.json
- dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireAdminSessionTest.php 0 additions, 1 deletion.../Magento/Backend/Test/TestCase/ExpireAdminSessionTest.php
- dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/GlobalSearchEntityTest.php 1 addition, 2 deletions.../Magento/Backend/Test/TestCase/GlobalSearchEntityTest.php
- dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersDisableTest.php 0 additions, 1 deletion...Magento/Backend/Test/TestCase/HttpsHeadersDisableTest.php
- dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersEnableTest.php 0 additions, 1 deletion.../Magento/Backend/Test/TestCase/HttpsHeadersEnableTest.php
- dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.php 0 additions, 1 deletion...ts/app/Magento/Backend/Test/TestCase/NavigateMenuTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php 1 addition, 2 deletions...Braintree/Test/TestCase/BraintreeSettlementReportTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php 1 addition, 2 deletions...ree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php 1 addition, 2 deletions...Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php 1 addition, 2 deletions...st/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php 1 addition, 2 deletions...to/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php 1 addition, 2 deletions...aintree/Test/TestCase/OnePageCheckoutWith3dSecureTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php 1 addition, 2 deletions.../Test/TestCase/OnePageCheckoutWithBraintreePaypalTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.php 1 addition, 2 deletions...est/TestCase/SaveUseDeleteVaultForPaypalBraintreeTest.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.php 1 addition, 2 deletions...tree/Test/TestCase/UseVaultWith3dSecureOnCheckoutTest.php
- dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php 1 addition, 2 deletions...to/Bundle/Test/TestCase/CreateBundleProductEntityTest.php
- dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php 1 addition, 2 deletions...to/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
Please register or sign in to comment