Skip to content

Commit 76e2375

Browse files
committed
Merge branch '2.4-develop' of github.com:magento/magento2 into 40-mview-patch-update-version-to-be-merged
# Conflicts: # lib/internal/Magento/Framework/Mview/View/Subscription.php
2 parents 3403964 + 297728f commit 76e2375

File tree

722 files changed

+23865
-5585
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

722 files changed

+23865
-5585
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ atlassian*
5858
/pub/media/tmp/*
5959
!/pub/media/tmp/.htaccess
6060
/pub/media/captcha/*
61+
/pub/media/sitemap/*
62+
!/pub/media/sitemap/.htaccess
6163
/pub/static/*
6264
!/pub/static/.htaccess
6365

0 commit comments

Comments
 (0)