Merge branch '2.2-develop' of https://github.com/magento/magento2ce into MAGETWO-81090

2dbf7825 · Andrii Voskoboinikov · 96b4755b · 4d4e88a8 · 2dbf7825 · 2dbf7825
Commit 2dbf7825 authored 7 years ago by Andrii Voskoboinikov
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_bundle_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_bundle_rollback.php
--- a/dev/tests/js/jasmine/tests/app/code/Magento/InstantPurchase/frontend/web/js/view/instant-purchase.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/InstantPurchase/frontend/web/js/view/instant-purchase.test.js
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
--- a/dev/tests/unit/phpunit.xml.dist
+++ b/dev/tests/unit/phpunit.xml.dist
--- a/lib/internal/Magento/Framework/Model/AbstractModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractModel.php
--- a/lib/internal/Magento/Framework/Session/SessionManager.php
+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json