Skip to content

Commit 6c2f8a9

Browse files
committed
Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MTA-2766
2 parents 3e267bc + 5a4ffe9 commit 6c2f8a9

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

composer.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77
"OSL-3.0",
88
"AFL-3.0"
99
],
10-
"repositories": [
11-
{
12-
"type": "composer",
13-
"url": "https://repo.magento.com/"
14-
}
15-
],
1610
"require": {
1711
"php": "~5.5.0|~5.6.0|~7.0.0",
1812
"zendframework/zend-stdlib": "~2.4.6",

composer.lock

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

0 commit comments

Comments
 (0)