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

Merge branch '2.13.x' into 3.1.x #4702

Merged
merged 6 commits into from
Jul 6, 2021
Merged

Merge branch '2.13.x' into 3.1.x #4702

merged 6 commits into from
Jul 6, 2021

Conversation

morozov
Copy link
Member

@morozov morozov commented Jul 6, 2021

There's an extra commit to the target branch before the merge and some changes in psalm.xml.dist made in the merge commit. This is necessary to work around vimeo/psalm#5472 which only affects 3.1.x and newer branches.

@morozov morozov requested review from alcaeus and greg0ire and removed request for alcaeus July 6, 2021 05:50
@morozov morozov marked this pull request as draft July 6, 2021 05:51
@morozov morozov merged commit 2549642 into doctrine:3.1.x Jul 6, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 21, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants