Skip to content

Commit a2e2c65

Browse files
Merge branch '2.7' into 2.8
* 2.7: Require symfony/intl ~2.4 when Locale::setDefault() is used [Form][2.7][ Choice type] fixed groups with empty array. Conflicts: src/Symfony/Component/Form/composer.json src/Symfony/Component/Translation/composer.json src/Symfony/Component/Validator/composer.json
2 parents dd9a272 + 53020de commit a2e2c65

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"require-dev": {
2222
"symfony/phpunit-bridge": "~2.7|~3.0.0",
2323
"symfony/config": "~2.7",
24-
"symfony/intl": "~2.3|~3.0.0",
24+
"symfony/intl": "~2.4|~3.0.0",
2525
"symfony/yaml": "~2.2|~3.0.0",
2626
"psr/log": "~1.0"
2727
},

0 commit comments

Comments
 (0)