Skip to content

Commit 6f7785f

Browse files
author
Bohdan Shevchenko
committed
Merge remote-tracking branch 'origin/2.4-develop' into MC-38960
2 parents 537fc27 + f8dd0b5 commit 6f7785f

File tree

261 files changed

+8716
-3392
lines changed

Some content is hidden

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

261 files changed

+8716
-3392
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)