Merge branch '2.4-develop' into nginx-conf-remove-recursion

magento · Jan 5, 2021 · dc1662d · dc1662d
2 parents 9f3ab3a + 960a51f
commit dc1662d
Show file tree

Hide file tree

Showing 1,452 changed files with 46,011 additions and 10,871 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -16,3 +16,7 @@ indent_size = 2
 
 [{composer, auth}.json]
 indent_size = 4
+
+[db_schema_whitelist.json]
+indent_size = 4
+trim_trailing_whitespace = false
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