Merge branch 'FearlessKiwis-MAGETWO-35975-weee-caching' of...
Merge branch 'FearlessKiwis-MAGETWO-35975-weee-caching' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop Conflicts: app/code/Magento/Weee/composer.json
Showing
- app/code/Magento/Tax/Model/App/Action/ContextPlugin.php 2 additions, 1 deletionapp/code/Magento/Tax/Model/App/Action/ContextPlugin.php
- app/code/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php 88 additions, 39 deletions...de/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php
- app/code/Magento/Tax/Test/Unit/Model/Observer/SessionTest.php 1 addition, 1 deletion...code/Magento/Tax/Test/Unit/Model/Observer/SessionTest.php
- app/code/Magento/Weee/Model/App/Action/ContextPlugin.php 205 additions, 0 deletionsapp/code/Magento/Weee/Model/App/Action/ContextPlugin.php
- app/code/Magento/Weee/Model/Observer/Session.php 139 additions, 0 deletionsapp/code/Magento/Weee/Model/Observer/Session.php
- app/code/Magento/Weee/Model/Resource/Tax.php 34 additions, 0 deletionsapp/code/Magento/Weee/Model/Resource/Tax.php
- app/code/Magento/Weee/Model/Tax.php 22 additions, 1 deletionapp/code/Magento/Weee/Model/Tax.php
- app/code/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php 378 additions, 0 deletions...e/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php
- app/code/Magento/Weee/Test/Unit/Model/Observer/SessionTest.php 166 additions, 0 deletions...ode/Magento/Weee/Test/Unit/Model/Observer/SessionTest.php
- app/code/Magento/Weee/Test/Unit/Model/Resource/TaxTest.php 93 additions, 0 deletionsapp/code/Magento/Weee/Test/Unit/Model/Resource/TaxTest.php
- app/code/Magento/Weee/composer.json 1 addition, 0 deletionsapp/code/Magento/Weee/composer.json
- app/code/Magento/Weee/etc/frontend/di.xml 4 additions, 0 deletionsapp/code/Magento/Weee/etc/frontend/di.xml
- app/code/Magento/Weee/etc/frontend/events.xml 16 additions, 0 deletionsapp/code/Magento/Weee/etc/frontend/events.xml
Please register or sign in to comment