Merge branch '2.4-develop' into save-checkout-address

magento · Nov 13, 2020 · cc82610 · cc82610
2 parents 170620e + 252dd90
commit cc82610
Show file tree

Hide file tree

Showing 305 changed files with 11,565 additions and 3,646 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