Skip to content

Commit b2d68c5

Browse files
author
Oleksandr Iegorov
committed
Merge branch '2.4-develop' of https://github.com/magento/magento2ce into MC-29335
� Conflicts: � app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminOpenCurrencyRatesPageActionGroup.xml
2 parents b9b6027 + 91aaeec commit b2d68c5

File tree

583 files changed

+18041
-5049
lines changed

Some content is hidden

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

583 files changed

+18041
-5049
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)