Skip to content

Commit c1e6871

Browse files
Merge branch '2.3' into 2.7
* 2.3: [Finder] Partially revert #17134 to fix a regression [HttpKernel] Fix mem usage when stripping the prod container exception when registering bags for started sessions Conflicts: src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/HttpKernel/Kernel.php
2 parents ee40cb4 + cc862ed commit c1e6871

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
@@ -22,7 +22,7 @@
2222
"require-dev": {
2323
"doctrine/common": "~2.3",
2424
"symfony/http-foundation": "~2.1",
25-
"symfony/intl": "~2.7.4",
25+
"symfony/intl": "~2.7.4|~2.8",
2626
"symfony/yaml": "~2.0,>=2.0.5",
2727
"symfony/config": "~2.2",
2828
"symfony/property-access": "~2.3",

0 commit comments

Comments
 (0)