Merge branch 'main' into feat/plugin-entry-points

Author: craforge

.github/workflows/detect-conflicts.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Check if PRs have merge conflicts
-        uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
+        uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0
         with:
           dirtyLabel: "conflicts"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"

release-notes.md

@@ -9,6 +9,8 @@
 
 ### Internal
 
+* ⬆ Bump eps1lon/actions-label-merge-conflict from 3.0.3 to 3.1.0 in the github-actions group. PR [#425](https://github.com/fastapi/fastapi-cli/pull/425) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump typer from 0.25.1 to 0.26.2. PR [#424](https://github.com/fastapi/fastapi-cli/pull/424) by [@dependabot[bot]](https://github.com/apps/dependabot).
 * 👷 Automate release preparation. PR [#420](https://github.com/fastapi/fastapi-cli/pull/420) by [@tiangolo](https://github.com/tiangolo).
 * 🔥 Remove old package stub slim, not user nor needed. PR [#419](https://github.com/fastapi/fastapi-cli/pull/419) by [@tiangolo](https://github.com/tiangolo).
 * ⬆ Bump zizmorcore/zizmor-action from 0.5.3 to 0.5.6. PR [#414](https://github.com/fastapi/fastapi-cli/pull/414) by [@dependabot[bot]](https://github.com/apps/dependabot).