Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the packages that have become optional in version 1.12 of the ResourceBundle. #17163

Merged
merged 1 commit into from
Oct 9, 2024

Conversation

Wojdylak
Copy link
Member

@Wojdylak Wojdylak commented Oct 9, 2024

Q A
Branch? 1.13
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Related tickets n/a
License MIT

@Wojdylak Wojdylak requested review from a team as code owners October 9, 2024 10:37
@Wojdylak Wojdylak force-pushed the add-required-packages branch from 8f85865 to 7289c29 Compare October 9, 2024 10:41
Copy link

github-actions bot commented Oct 9, 2024

Bunnyshell Preview Environment deleted

Available commands:

  • /bns:deploy to redeploy the environment

@GSadee GSadee added Maintenance CI configurations, READMEs, releases, etc. Dependencies Pull requests that update a dependency file labels Oct 9, 2024
@GSadee GSadee merged commit e6722bb into Sylius:1.13 Oct 9, 2024
28 checks passed
@GSadee
Copy link
Member

GSadee commented Oct 9, 2024

Thanks, Karol! 🥇

GSadee added a commit that referenced this pull request Oct 9, 2024
This PR was merged into the 1.14 branch.

Discussion
----------

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.14 -m "Resolve conflicts between 1.13 and 1.14"
```

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.

Commits
-------

7289c29 Add the packages that have become optional in version 1.12 of the ResourceBundle.
e6722bb minor #17163 Add the packages that have become optional in version 1.12 of the ResourceBundle. (Wojdylak)
@Wojdylak Wojdylak deleted the add-required-packages branch October 24, 2024 06:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Dependencies Pull requests that update a dependency file Maintenance CI configurations, READMEs, releases, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants