Skip to content

Commit

Permalink
[UPMERGE] 1.12 -> 1.13 (#16200)
Browse files Browse the repository at this point in the history
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
push the changes to this PR.
  • Loading branch information
Rafikooo committed May 3, 2024
2 parents 00aeb63 + cfc98f9 commit 2177d16
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ sylius:
review:
author:
not_blank: Bitte geben Sie Ihre E-Mail-Adresse ein.
rating:
range: Bewertung muss eine Ganzzahl im Bereich 1-5 sein.
taxon_image:
file:
max_size: Das Bild ist zu groß - {{ size }}{{ suffix }}. Maximal zulässige Größe {{ limit }}{{ suffix }}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ sylius:
review:
author:
not_blank: Bitte geben Sie Ihre E-Mail-Adresse ein.
rating:
range: Bewertung muss eine Ganzzahl im Bereich 1-5 sein.
taxon_image:
file:
max_size: Das Bild ist zu groß - {{ size }}{{ suffix }}. Maximal zulässige Größe {{ limit }}{{ suffix }}.
Expand Down

0 comments on commit 2177d16

Please sign in to comment.