fix Merge branch '2.7' into 2.8 JsonFileLoader#14954
Merged
fabpot merged 1 commit intosymfony:2.8from Jun 11, 2015
Merged
Conversation
Member
|
Thank you @gimler. |
fabpot
added a commit
that referenced
this pull request
Jun 11, 2015
This PR was merged into the 2.8 branch. Discussion ---------- fix Merge branch '2.7' into 2.8 JsonFileLoader This fix a merge commit see 5593bdd. The `stream_is_local` and `file_exists` checks are all ready done in the parent `FileLoader` class. | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | no | Fixed tickets | none | License | MIT | Doc PR | none Commits ------- 692deff fix Merge branch '2.7' into 2.8 JsonFileLoader
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This fix a merge commit see 5593bdd. The
stream_is_localandfile_existschecks are all ready done in the parentFileLoaderclass.