Merge branch '7.0' into 7.1

* 7.0: Remove subtree split checks Revert "minor #54653 Auto-close PRs on subtree-splits (nicolas-grekas)"
symfony · May 31, 2024 · fa34c77 · fa34c77
2 parents c5f718c + 89bdddd
commit fa34c77
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 46 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/check-subtree-split.yml b/.github/workflows/check-subtree-split.yml