Merge remote-tracking branch 'mainline-ce/develop' into MAGETWO-35288-Fix-REST-Api-Documentation
Showing
- .htaccess 7 additions, 0 deletions.htaccess
- .htaccess.sample 7 additions, 0 deletions.htaccess.sample
- CHANGELOG.md 212 additions, 41 deletionsCHANGELOG.md
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/Authorization/composer.json 3 additions, 3 deletionsapp/code/Magento/Authorization/composer.json
- app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php 2 additions, 2 deletions...Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php
- app/code/Magento/Backend/Test/Unit/App/Router/NoRouteHandlerTest.php 2 additions, 2 deletions...gento/Backend/Test/Unit/App/Router/NoRouteHandlerTest.php
- app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php 1 addition, 1 deletion...d/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php
- app/code/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php 1 addition, 1 deletion...ode/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php
- app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/CurrencyTest.php 1 addition, 1 deletion...t/Unit/Block/Widget/Grid/Column/Renderer/CurrencyTest.php
- app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php 11 additions, 11 deletions...agento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php
- app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php 3 additions, 3 deletions...de/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php
- app/code/Magento/Backend/composer.json 18 additions, 18 deletionsapp/code/Magento/Backend/composer.json
- app/code/Magento/Backup/composer.json 5 additions, 5 deletionsapp/code/Magento/Backup/composer.json
- app/code/Magento/Bundle/Model/Resource/Indexer/Price.php 0 additions, 21 deletionsapp/code/Magento/Bundle/Model/Resource/Indexer/Price.php
- app/code/Magento/Bundle/Test/Unit/Helper/Catalog/Product/ConfigurationTest.php 1 addition, 1 deletion...le/Test/Unit/Helper/Catalog/Product/ConfigurationTest.php
- app/code/Magento/Bundle/Test/Unit/Model/OptionTest.php 1 addition, 1 deletionapp/code/Magento/Bundle/Test/Unit/Model/OptionTest.php
- app/code/Magento/Bundle/Test/Unit/Model/Product/Attribute/Source/Price/ViewTest.php 2 additions, 2 deletions...st/Unit/Model/Product/Attribute/Source/Price/ViewTest.php
- app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php 2 additions, 2 deletions...code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php
- app/code/Magento/Bundle/Test/Unit/Pricing/Price/TierPriceTest.php 1 addition, 1 deletion.../Magento/Bundle/Test/Unit/Pricing/Price/TierPriceTest.php
Please register or sign in to comment