Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Bring back conflict to symfony/polyfill-mbstring#12733

Merged
pamil merged 1 commit into
Sylius:1.10from
GSadee:bring-back-mbstring-conflict
Jun 21, 2021
Merged

Bring back conflict to symfony/polyfill-mbstring#12733
pamil merged 1 commit into
Sylius:1.10from
GSadee:bring-back-mbstring-conflict

Conversation

@GSadee
Copy link
Copy Markdown
Member

@GSadee GSadee commented Jun 21, 2021

Q A
Branch? 1.10
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Related tickets
License MIT

@GSadee GSadee requested a review from a team as a code owner June 21, 2021 07:36
@probot-autolabeler probot-autolabeler Bot added the Maintenance CI configurations, READMEs, releases, etc. label Jun 21, 2021
@GSadee GSadee force-pushed the bring-back-mbstring-conflict branch from 0cbe8d5 to ecc9869 Compare June 21, 2021 07:50
@pamil pamil merged commit 3b332e5 into Sylius:1.10 Jun 21, 2021
@pamil
Copy link
Copy Markdown
Contributor

pamil commented Jun 21, 2021

Thanks, Grzegorz! 🥇

@GSadee GSadee deleted the bring-back-mbstring-conflict branch June 21, 2021 07:54
@GSadee GSadee mentioned this pull request Jun 21, 2021
Merged
pamil added a commit that referenced this pull request Jun 21, 2021
@pamil
minor #12734 Revert "Bring back conflict to symfony/polyfill-mbstring…
3602a77 
…" (GSadee)

This PR was merged into the 1.10 branch.

Discussion
----------

Reverts #12733 as it does not fix the issue

Commits
-------

24299d9 Revert "Bring back conflict to symfony/polyfill-mbstring"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@pamil pamil pamil approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Maintenance CI configurations, READMEs, releases, etc.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@GSadee @pamil