Skip to content

Commit dcb356c

Browse files
author
Ievgen Shakhsuvarov
committed
Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-32078-CheckoutAgreements
2 parents 3ddaced + 46c48d3 commit dcb356c

File tree

5 files changed

+491
-23
lines changed

5 files changed

+491
-23
lines changed

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@
143143
"magento/language-pt_br": "self.version",
144144
"magento/language-zh_cn": "self.version",
145145
"magento/framework": "self.version",
146-
"magento/project-setup": "0.1.0",
147146
"oyejorge/less.php": "1.7.0",
148147
"trentrichardson/jquery-timepicker-addon": "1.4.3",
149148
"components/handlebars.js": "1.3.0",

composer.lock

Lines changed: 20 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)