Merge branch '2.4-develop' into active-carriers

magento · Nov 13, 2020 · 73edcb1 · 73edcb1
2 parents f5d692f + 252dd90
commit 73edcb1
Show file tree

Hide file tree

Showing 373 changed files with 14,410 additions and 3,935 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