Manual merge master with 3.x #246
Closed
Conversation
This file contains 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
* DevKit updates * Apply fixes from StyleCI (sonata-project#241) * DevKit updates * DevKit updates * Remove support for PHP from 5.3 to 5.5 * Phpunit 5 * DevKit updates
jordisala1991
force-pushed
the
merge/3.x
branch
from
ac5e73b
to
a4a2e5c
Compare
jordisala1991
force-pushed
the
merge/3.x
branch
from
a4a2e5c
to
88754fc
Compare
|
Could you please rebase your PR and fix merge conflicts? |
Sign up for free
to 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.
Do not merge , just approve