Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 042328d

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
minor #24058 [FrameworkBundle] Fix Form conflict rule (chalasr)
This PR was merged into the 3.4 branch. Discussion ---------- [FrameworkBundle] Fix Form conflict rule | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Fixes https://travis-ci.org/symfony/symfony/jobs/270430600#L2628. /cc @ogizanagi @yceruto Commits ------- e1f9ff6 [FrameworkBundle] Fix form conflict rule
2 parents 0beb598 + e1f9ff6 commit 042328d
Copy full SHA for 042328d

File tree

Expand file treeCollapse file tree

1 file changed

+1
-1
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+1
-1
lines changed

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
6666
"symfony/asset": "<3.3",
6767
"symfony/console": "<3.4",
68-
"symfony/form": "<3.3",
68+
"symfony/form": "<3.4",
6969
"symfony/property-info": "<3.3",
7070
"symfony/serializer": "<3.3",
7171
"symfony/translation": "<3.4",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.