[UPMERGE] 1.13 -> 2.0 (#15685)

Browse source

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 
git merge upstream/2.0 --no-commit
```

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
change the commit title to
```
Resolve conflicts between 1.13 and 2.0
```

...

This commit is contained in:

Jacob Tobiasz 2023-12-27 10:51:05 +01:00 • committed by GitHub

parent 9d6088fe0c 9e0d60a315

commit 2e667f9f63

No known key found for this signature in database

GPG key ID: 4AEE18F83AFDEB23

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available