Merge branch 'develop' into FearlessKiwis-MAGETWO-59785-IncorrectUrls-in-sitemap
* develop: MAGETWO-60765: Error is thrown while scheduling an update for a locale different that US_en MAGETWO-60765: Error is thrown while scheduling an update for a locale different that US_en MAGETWO-60002: Update functional test handler to avoid code duplication MAGETWO-62237: [Github][PR] Blank theme: Fix sorter icon changing #7628 MAGETWO-62237: [Github][PR] Blank theme: Fix sorter icon changing #7628 MAGETWO-60765: Error is thrown while scheduling an update for a locale different that US_en MAGETWO-60765: Error is thrown while scheduling an update for a locale different that US_en MAGETWO-60765: Error is thrown while scheduling an update for a locale different that US_en MAGETWO-60478: Invalid SalesInventory module version - 2.2
Showing
- app/code/Magento/SalesInventory/composer.json 1 addition, 1 deletionapp/code/Magento/SalesInventory/composer.json
- app/code/Magento/Ui/view/base/web/js/form/element/date.js 10 additions, 11 deletionsapp/code/Magento/Ui/view/base/web/js/form/element/date.js
- app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less 5 additions, 3 deletions...blank/Magento_Catalog/web/css/source/module/_toolbar.less
- composer.json 1 addition, 1 deletioncomposer.json
- composer.lock 80 additions, 77 deletionscomposer.lock
- dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php 17 additions, 2 deletions...nto/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
- dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date-time.test.js 41 additions, 0 deletions...pp/code/Magento/Ui/base/js/form/element/date-time.test.js
- dev/tests/js/jasmine/tests/lib/mage/misc.test.js 1 addition, 1 deletiondev/tests/js/jasmine/tests/lib/mage/misc.test.js
- lib/web/mage/utils/misc.js 0 additions, 1 deletionlib/web/mage/utils/misc.js
Please register or sign in to comment