Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce...
Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into MAGETWO-32078-CheckoutAgreements
Showing
- app/code/Magento/Backup/Model/Backup.php 3 additions, 3 deletionsapp/code/Magento/Backup/Model/Backup.php
- app/code/Magento/Customer/Model/Resource/Address.php 3 additions, 3 deletionsapp/code/Magento/Customer/Model/Resource/Address.php
- app/code/Magento/Customer/Model/Resource/Customer.php 3 additions, 3 deletionsapp/code/Magento/Customer/Model/Resource/Customer.php
- app/code/Magento/Email/Model/AbstractTemplate.php 3 additions, 3 deletionsapp/code/Magento/Email/Model/AbstractTemplate.php
- app/code/Magento/Email/Model/BackendTemplate.php 2 additions, 2 deletionsapp/code/Magento/Email/Model/BackendTemplate.php
- app/code/Magento/Email/Model/Template.php 2 additions, 2 deletionsapp/code/Magento/Email/Model/Template.php
- app/code/Magento/Newsletter/Model/Queue.php 2 additions, 2 deletionsapp/code/Magento/Newsletter/Model/Queue.php
- app/code/Magento/Newsletter/Model/Template.php 2 additions, 2 deletionsapp/code/Magento/Newsletter/Model/Template.php
- app/code/Magento/Payment/Helper/Data.php 3 additions, 3 deletionsapp/code/Magento/Payment/Helper/Data.php
- app/code/Magento/ProductAlert/Model/Email.php 3 additions, 3 deletionsapp/code/Magento/ProductAlert/Model/Email.php
- app/code/Magento/Store/Model/App/Emulation.php 3 additions, 2 deletionsapp/code/Magento/Store/Model/App/Emulation.php
- dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php 1 addition, 1 deletion...ntegration/testsuite/Magento/Email/Model/TemplateTest.php
- dev/tests/integration/testsuite/Magento/Framework/Validator/FactoryTest.php 4 additions, 4 deletions...ion/testsuite/Magento/Framework/Validator/FactoryTest.php
- dev/tests/integration/testsuite/Magento/Store/Model/App/EmulationTest.php 5 additions, 5 deletions...ation/testsuite/Magento/Store/Model/App/EmulationTest.php
- dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php 2 additions, 0 deletions...testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
- dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php 2 additions, 2 deletions...testsuite/Magento/Customer/Model/Resource/AddressTest.php
- dev/tests/unit/testsuite/Magento/Email/Model/TemplateTest.php 1 addition, 1 deletion...tests/unit/testsuite/Magento/Email/Model/TemplateTest.php
- dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/PublisherTest.php 3 additions, 2 deletions...tsuite/Magento/Framework/App/View/Asset/PublisherTest.php
- dev/tests/unit/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php 1 addition, 29 deletions...suite/Magento/Framework/Filesystem/Directory/ReadTest.php
- dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php 13 additions, 33 deletions...ite/Magento/Framework/Filesystem/File/ReadFactoryTest.php
Please register or sign in to comment