[UPMERGE] 1.14 -> 2.0 (#16194)

This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.0 -m "Resolve conflicts between 1.14 and 2.0"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
This commit is contained in:
Rafał Jaskulski 2024-04-30 10:49:49 +02:00 committed by GitHub
commit 5daae8cc43
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -25,6 +25,9 @@ jobs:
target_branch: "1.13"
-
base_branch: "1.13"
target_branch: "1.14"
-
base_branch: "1.14"
target_branch: "2.0"
-
base_branch: "2.0"