Skip to content
Snippets Groups Projects
Commit cf003c07 authored by Cari Spruiell's avatar Cari Spruiell
Browse files

MAGETWO-50326: Merge and stabilize builds for bug fixes and public PRs and SalesRuleStaging Doc

 - update composer.lock
parent dec605d0
Branches
Tags
No related merge requests found
...@@ -325,8 +325,8 @@ ...@@ -325,8 +325,8 @@
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/magento/composer/zipball/1be267e71debac6e0d9fae4e5144f6095cffbe89", "url": "https://api.github.com/repos/magento/composer/zipball/1be267e71debac6e0d9fae4e5144f6095cffbe89",
"reference": null, "reference": "1be267e71debac6e0d9fae4e5144f6095cffbe89",
"shasum": "79156c3e7317af1ff64a482ba90ec81c66b82c73" "shasum": ""
}, },
"require": { "require": {
"composer/composer": "1.0.0-alpha10", "composer/composer": "1.0.0-alpha10",
...@@ -342,11 +342,13 @@ ...@@ -342,11 +342,13 @@
"Magento\\Composer\\": "src" "Magento\\Composer\\": "src"
} }
}, },
"notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"OSL-3.0", "OSL-3.0",
"AFL-3.0" "AFL-3.0"
], ],
"description": "Magento composer library helps to instantiate Composer application and run composer commands." "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
"time": "2015-10-01 14:39:10"
}, },
{ {
"name": "magento/magento-composer-installer", "name": "magento/magento-composer-installer",
...@@ -430,12 +432,12 @@ ...@@ -430,12 +432,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/magento/zf1.git", "url": "https://github.com/magento/zf1.git",
"reference": "dbdf178992bfa52d6e978e62131162301ff6b76f" "reference": "c9d607bfd9454bc18b9deff737ccd5d044e2ab10"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/magento/zf1/zipball/c9d607bfd9454bc18b9deff737ccd5d044e2ab10", "url": "https://api.github.com/repos/magento/zf1/zipball/c9d607bfd9454bc18b9deff737ccd5d044e2ab10",
"reference": "dbdf178992bfa52d6e978e62131162301ff6b76f", "reference": "c9d607bfd9454bc18b9deff737ccd5d044e2ab10",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -469,7 +471,7 @@ ...@@ -469,7 +471,7 @@
"ZF1", "ZF1",
"framework" "framework"
], ],
"time": "2015-09-30 13:04:03" "time": "2015-10-29 14:34:55"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment