Merge branch '5.4' into 6.4

* 5.4: Revert "minor #54653 Auto-close PRs on subtree-splits (nicolas-grekas)"
symfony · May 31, 2024 · d6eda99 · d6eda99
2 parents cd0cd9c + ef0be2b
commit d6eda99
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