Merge branch '2.2-develop' of https://github.com/magento/magento2ce into MAGETWO-81090
Showing
- app/code/Magento/Indexer/composer.json 1 addition, 1 deletionapp/code/Magento/Indexer/composer.json
- app/code/Magento/InstantPurchase/Model/PlaceOrder.php 34 additions, 12 deletionsapp/code/Magento/InstantPurchase/Model/PlaceOrder.php
- app/code/Magento/InstantPurchase/composer.json 26 additions, 26 deletionsapp/code/Magento/InstantPurchase/composer.json
- app/code/Magento/InstantPurchase/view/frontend/web/js/view/instant-purchase.js 105 additions, 101 deletions...antPurchase/view/frontend/web/js/view/instant-purchase.js
- app/code/Magento/InstantPurchase/view/frontend/web/template/confirmation.html 15 additions, 0 deletions...tantPurchase/view/frontend/web/template/confirmation.html
- app/code/Magento/InstantPurchase/view/frontend/web/template/instant-purchase.html 34 additions, 29 deletions...Purchase/view/frontend/web/template/instant-purchase.html
- app/code/Magento/Integration/composer.json 1 addition, 1 deletionapp/code/Magento/Integration/composer.json
- app/code/Magento/NewRelicReporting/composer.json 1 addition, 1 deletionapp/code/Magento/NewRelicReporting/composer.json
- app/code/Magento/Newsletter/composer.json 1 addition, 1 deletionapp/code/Magento/Newsletter/composer.json
- app/code/Magento/OfflineShipping/composer.json 1 addition, 1 deletionapp/code/Magento/OfflineShipping/composer.json
- app/code/Magento/PageCache/composer.json 1 addition, 1 deletionapp/code/Magento/PageCache/composer.json
- app/code/Magento/PageCache/etc/varnish4.vcl 8 additions, 0 deletionsapp/code/Magento/PageCache/etc/varnish4.vcl
- app/code/Magento/PageCache/etc/varnish5.vcl 8 additions, 0 deletionsapp/code/Magento/PageCache/etc/varnish5.vcl
- app/code/Magento/Payment/composer.json 1 addition, 1 deletionapp/code/Magento/Payment/composer.json
- app/code/Magento/Paypal/composer.json 1 addition, 1 deletionapp/code/Magento/Paypal/composer.json
- app/code/Magento/ProductVideo/composer.json 1 addition, 1 deletionapp/code/Magento/ProductVideo/composer.json
- app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php 26 additions, 25 deletions...gento/Quote/Model/ResourceModel/Quote/Item/Collection.php
- app/code/Magento/Quote/composer.json 1 addition, 1 deletionapp/code/Magento/Quote/composer.json
- app/code/Magento/QuoteAnalytics/composer.json 2 additions, 2 deletionsapp/code/Magento/QuoteAnalytics/composer.json
- app/code/Magento/ReleaseNotification/composer.json 20 additions, 20 deletionsapp/code/Magento/ReleaseNotification/composer.json
Please register or sign in to comment