Skip to content

Commit

Permalink
MC-33126: Pull request delivery
Browse files Browse the repository at this point in the history
  • Loading branch information
fascinosum committed May 8, 2020
1 parent 771242c commit 90f9645
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 33 deletions.
8 changes: 1 addition & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"laminas/laminas-uri": "^2.5.1",
"laminas/laminas-validator": "^2.6.0",
"laminas/laminas-view": "~2.11.2",
"magento/composer": "MC-33066-dev",
"magento/composer": "1.6.x-dev",
"magento/magento-composer-installer": ">=0.1.11",
"magento/zendframework1": "~1.14.2",
"monolog/monolog": "^1.17",
Expand Down Expand Up @@ -356,11 +356,5 @@
"Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/"
}
},
"repositories": [
{
"type": "vcs",
"url": "git@github.com:magento-trigger/composer.git"
}
],
"prefer-stable": true
}
51 changes: 25 additions & 26 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 90f9645

Please sign in to comment.