Skip to content

Commit 25f29a9

Browse files
Merge branch '514_content-snapshot-category-admin-page' of github.com:magento/magento2-page-builder into 511_content-snapshot-product-admin-page
Conflicts: app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/page-builder.ts
2 parents 96ce152 + 526d054 commit 25f29a9

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

app/code/Magento/PageBuilder/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Page,Page
1616
"Page with ID: %s doesn't exist","Page with ID: %s doesn't exist"
1717
"ID: %s","ID: %s"
1818
Condition,Condition
19-
Photo upload is available in full screen mode,Photo upload is available in full screen mode
19+
"Photo upload is available in full screen mode","Photo upload is available in full screen mode"
2020
"This will change your Admin and storefront by:","This will change your Admin and storefront by:"
2121
"Removing PageBuilder's advanced content tools","Removing PageBuilder's advanced content tools"
2222
"from their assigned text fields and adding a basic text editor as replacement.","from their assigned text fields and adding a basic text editor as replacement."

app/code/Magento/PageBuilder/view/adminhtml/web/js/config.js

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/page-builder.js

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)