Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…

…nto MC-18143
magento · Oct 9, 2019 · cc6eccc · cc6eccc
2 parents a84c91b + 81ab7c4
commit cc6eccc
Show file tree

Hide file tree

Showing 3 changed files with 455 additions and 600 deletions.
diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
         "wikimedia/less.php": "~1.8.0",
         "paragonie/sodium_compat": "^1.6",
         "pelago/emogrifier": "^2.0.0",
-        "php-amqplib/php-amqplib": "~2.7.0",
+        "php-amqplib/php-amqplib": "~2.7.0|~2.10.0",
         "phpseclib/mcrypt_compat": "1.0.8",
         "phpseclib/phpseclib": "2.0.*",
         "ramsey/uuid": "~3.8.0",