Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[UPMERGE] 1.12 -> 1.13 (Sylius#15958)
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/1.13 -m "Resolve conflicts between 1.12 and 1.13" ``` 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.12 and 1.13 ```
- Loading branch information