Merge remote-tracking branch 'upstream/develop' into MAGETWO-60420-remove-unserialize-from-menu

Author: Joan He

app/code/Magento/SalesInventory/composer.json

@@ -10,7 +10,7 @@
         "magento/framework": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.0.0-dev",
+    "version": "100.2.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less

@@ -81,9 +81,11 @@
         );
     }
 
-    .sorter.sort-desc {
-        &:before {
-            content: @icon-arrow-down;
+    .sorter {
+        .sort-desc {
+            &:before {
+                content: @icon-arrow-down;
+            }
         }
     }
 

composer.json

@@ -151,7 +151,7 @@
         "magento/module-rss": "100.2.0-dev",
         "magento/module-rule": "100.2.0-dev",
         "magento/module-sales": "100.2.0-dev",
-        "magento/module-sales-inventory": "100.0.0-dev",
+        "magento/module-sales-inventory": "100.2.0-dev",
         "magento/module-sales-rule": "100.2.0-dev",
         "magento/module-sales-sequence": "100.2.0-dev",
         "magento/module-sample-data": "100.2.0-dev",