[FrameworkBundle] fix merge of 3.3 into 3.4 #25510
Merged
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
stof
approved these changes
Dec 15, 2017
|
Thank you @dmaicher. |
nicolas-grekas
added a commit
that referenced
this pull request
Dec 15, 2017
This PR was merged into the 3.4 branch. Discussion ---------- [FrameworkBundle] fix merge of 3.3 into 3.4 | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - In 3.4+ there were tests for disabled esi/ssi already so now they have been duplicated by merging #25489 up from 2.7 This just cleans up the duplication. Commits ------- 76e16ff [FrameworkBundle] fix merge of 3.3 into 3.4
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.
In 3.4+ there were tests for disabled esi/ssi already so now they have been duplicated by merging #25489 up from 2.7
This just cleans up the duplication.