Skip to content

Commit 93ab5dc

Browse files
Merge branch '3.3' into 3.4
* 3.3: [Console] Fix traversable autocomplete values [ExpressionLanguage] Fix PhpDoc type-hints on Token value bumped Symfony version to 3.3.12 updated VERSION for 3.3.11 updated CHANGELOG for 3.3.11 bumped Symfony version to 2.8.30 updated VERSION for 2.8.29 updated CHANGELOG for 2.8.29 bumped Symfony version to 2.7.37 updated VERSION for 2.7.36 update CONTRIBUTORS for 2.7.36 updated CHANGELOG for 2.7.36
2 parents ca845c6 + 8730553 commit 93ab5dc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"symfony/asset": "~2.8|~3.0|~4.0",
2525
"symfony/dependency-injection": "~2.8|~3.0|~4.0",
2626
"symfony/finder": "~2.8|~3.0|~4.0",
27-
"symfony/form": "~3.4|~4.0",
27+
"symfony/form": "~3.4-beta4|~4.0-beta4",
2828
"symfony/http-foundation": "^3.3.11|~4.0",
2929
"symfony/http-kernel": "~3.2|~4.0",
3030
"symfony/polyfill-intl-icu": "~1.0",
@@ -41,7 +41,7 @@
4141
"symfony/web-link": "~3.3|~4.0"
4242
},
4343
"conflict": {
44-
"symfony/form": "<3.4-beta4|~4.0,<4.0-beta4",
44+
"symfony/form": "<3.4",
4545
"symfony/console": "<3.4"
4646
},
4747
"suggest": {

0 commit comments

Comments
 (0)