Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork9.7k
[Serializer] Add missing conflict for property-info<3.1#21309
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
nicolas-grekas merged 1 commit intosymfony:3.1fromchalasr:serializer/propertyinfo-conflictJan 24, 2017
Merged
[Serializer] Add missing conflict for property-info<3.1#21309
nicolas-grekas merged 1 commit intosymfony:3.1fromchalasr:serializer/propertyinfo-conflictJan 24, 2017
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Member
dunglas commentedJan 16, 2017
Member
dunglas commentedJan 16, 2017 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
But I'm 👍 anyway because it will simplify everything. |
Member
xabbuh commentedJan 16, 2017
👍 |
Member
nicolas-grekas commentedJan 24, 2017
Thank you@chalasr. |
nicolas-grekas added a commit that referenced this pull requestJan 24, 2017
…(chalasr)This PR was merged into the 3.1 branch.Discussion----------[Serializer] Add missing conflict for property-info<3.1| Q | A| ------------- | ---| Branch? | 3.1| Bug fix? | no| New feature? | no| BC breaks? | no| Deprecations? | no| Tests pass? | yes| Fixed tickets |#21293 (comment)| License | MIT| Doc PR | n/aCommits-------60a0c4b [Serializer] Add missing conflict for property-info<3.1
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading.Please reload this page.