Merge branch '3.2'
* 3.2: Fix merge
This commit is contained in:
commit
d29fc2ca9e
@ -29,6 +29,7 @@
|
||||
"symfony/dependency-injection": "~2.8|~3.0",
|
||||
"symfony/expression-language": "~2.8|~3.0",
|
||||
"symfony/finder": "~2.8|~3.0",
|
||||
"symfony/form": "~2.8|~3.0",
|
||||
"symfony/routing": "~2.8|~3.0",
|
||||
"symfony/templating": "~2.8|~3.0",
|
||||
"symfony/yaml": "~2.8|~3.0",
|
||||
|
Reference in New Issue
Block a user