Skip to content

Commit 5dc7b5f

Browse files
committed
Merge branch '2.2.10-develop' of github.com:magento/magento2ce into MC-18722
2 parents 89ff782 + 6d900d8 commit 5dc7b5f

File tree

2 files changed

+13
-31
lines changed

2 files changed

+13
-31
lines changed

composer.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"phpseclib/mcrypt_compat": "1.0.8",
5555
"phpseclib/phpseclib": "2.0.*",
5656
"tedivm/jshrink": "~1.3.0",
57-
"magento/composer": "1.2.x-dev as 1.2.1",
57+
"magento/composer": "~1.2.0",
5858
"lib-libxml": "*",
5959
"ext-ctype": "*",
6060
"ext-gd": "*",
@@ -273,12 +273,5 @@
273273
"Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/"
274274
}
275275
},
276-
"prefer-stable": true,
277-
"minimum-stability": "dev",
278-
"repositories": {
279-
"magento.composer": {
280-
"type": "vcs",
281-
"url": "https://github.com/magento/composer.git"
282-
}
283-
}
276+
"minimum-stability": "stable"
284277
}

composer.lock

Lines changed: 11 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)