summaryrefslogtreecommitdiffstats
path: root/composer.lock
diff options
context:
space:
mode:
authorAlex Pott2016-03-14 10:49:22 (GMT)
committerAlex Pott2016-03-14 10:49:22 (GMT)
commit0f0c2c3eb9eedc2fbf879dd008ce18de1861cf54 (patch)
tree1fae2593b847339943b4692ce19fc851f8e6acb4 /composer.lock
parent076ebd34350b715f5b6262461eff4a32b28c8a6b (diff)
Issue #2638856 by bojanz, webflo, SiliconMind: Unable to install modules with core dependencies via composer
Diffstat (limited to 'composer.lock')
-rw-r--r--composer.lock10
1 files changed, 5 insertions, 5 deletions
diff --git a/composer.lock b/composer.lock
index 7bb2777..10bec80 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2340,16 +2340,16 @@
},
{
"name": "wikimedia/composer-merge-plugin",
- "version": "v1.3.0",
+ "version": "v1.3.1",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/composer-merge-plugin.git",
- "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9"
+ "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9",
- "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9",
+ "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
+ "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
"shasum": ""
},
"require": {
@@ -2385,7 +2385,7 @@
}
],
"description": "Composer plugin to merge multiple composer.json files",
- "time": "2015-11-06 20:31:16"
+ "time": "2016-03-08 17:11:37"
},
{
"name": "zendframework/zend-diactoros",