Skip to content

Commit 0aefe4c

Browse files
committed
Merge remote-tracking branch 'origin/develop' into 3.0.0-RC3
2 parents 7122e15 + 36b991d commit 0aefe4c

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

app/code/Magento/PageBuilder/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"magento/module-require-js": "*",
2323
"magento/module-media-storage": "*",
2424
"php": "~7.3.0||~7.4.0",
25-
"magento/dom": "2.1.7"
25+
"phpgt/dom": "2.1.6"
2626
},
2727
"suggest": {
2828
"magento/module-review": "*"

dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/whitelist/redundant_dependencies_pagebuilder.php

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)