This repository was archived by the owner on Nov 27, 2020. It is now read-only.
Allow Doctrine 2.4 to be installed #612
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
| @@ -9,7 +9,7 @@ | |||
| "require": { | |||
| "php": ">=5.3.3", | |||
| "symfony/symfony": "2.3.*", | |||
| "doctrine/orm": ">=2.2.3,<2.4-dev", | |||
| "doctrine/orm": ">=2.2.3", | |||
There was a problem hiding this comment.
this is too general as u can compare with my commit on master
|
Btw, git allows cherry-picking commits. |
|
yes @Tobion , but I wanted to test squashing ;) The fact is I've read the git doc one week ago |
fabpot
added a commit
that referenced
this pull request
Mar 14, 2014
This PR was merged into the 2.3 branch. Discussion ---------- Allow Doctrine 2.4 to be installed The commit 0cafa50#diff-b5d0ee8c97c7abd7e3fa29b9a27d1780, lets Doctrine 2.4 installable But it has been performed only on `master`, `2.4` Any reason why it shouldn't also be backported to last stable version of `symfony-standard` (`2.3`) ? Commits ------- 42937c1 Allow Doctrine 2.4 to be installed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The commit 0cafa50#diff-b5d0ee8c97c7abd7e3fa29b9a27d1780, lets Doctrine 2.4 installable
But it has been performed only on
master,2.4Any reason why it shouldn't also be backported to last stable version of
symfony-standard(2.3) ?