Merge branch '2.4-develop' into add-product-by-product-type

magento · Nov 13, 2020 · 6ebea22 · 6ebea22
2 parents 4921ce3 + 252dd90
commit 6ebea22
Show file tree

Hide file tree

Showing 449 changed files with 17,083 additions and 4,792 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