Skip to content

Commit 80bf0b2

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: [2.3] Add missing development dependencies Fix @return docs on HttpCache::restoreResponseBody() [Finder] Escape location for regex searches Make sure HttpCache is a trusted proxy Conflicts: src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Form/composer.json
2 parents dc53845 + 47d3e25 commit 80bf0b2

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@
2121
"symfony/http-kernel": "~2.2"
2222
},
2323
"require-dev": {
24+
"symfony/browser-kit": "~2.3",
25+
"symfony/form": "~2.3",
2426
"symfony/framework-bundle": "~2.2",
2527
"symfony/twig-bundle": "~2.2",
28+
"symfony/process": "~2.0",
2629
"symfony/validator": "~2.2",
2730
"symfony/yaml": "~2.0",
2831
"symfony/expression-language": "~2.4"

0 commit comments

Comments
 (0)