Merge remote-tracking branch 'upstream/2.4-develop' into 2.4-develop

magento · Nov 11, 2020 · dc957fb · dc957fb
2 parents 04eaa23 + f8dd0b5
commit dc957fb
Show file tree

Hide file tree

Showing 325 changed files with 11,494 additions and 3,673 deletions.
diff --git a/.gitignore b/.gitignore
@@ -58,6 +58,8 @@ atlassian*
 /pub/media/tmp/*
 !/pub/media/tmp/.htaccess
 /pub/media/captcha/*
+/pub/media/sitemap/*
+!/pub/media/sitemap/.htaccess
 /pub/static/*
 !/pub/static/.htaccess