8000 Merge branch '3.2' · symfony/symfony@d29fc2c · GitHub
[go: up one dir, main page]

Skip to content

Commit d29fc2c

Browse files
Merge branch '3.2'
* 3.2: Fix merge
2 parents 639e6b9 + 411afbe commit d29fc2c

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"symfony/dependency-injection": "~2.8|~3.0",
3030
"symfony/expression-language": "~2.8|~3.0",
3131
"symfony/finder": "~2.8|~3.0",
32+
"symfony/form": "~2.8|~3.0",
3233
"symfony/routing": "~2.8|~3.0",
3334
"symfony/templating": "~2.8|~3.0",
3435
"symfony/yaml": "~2.8|~3.0",

0 commit comments

Comments
 (0)
0