Merge branch '3.4' into 4.0

* 3.4:
  Fix dep
This commit is contained in:
Nicolas Grekas 2018-05-16 17:17:42 +02:00
commit 2f07052c25

View File

@ -44,6 +44,7 @@
"twig/twig": "~1.34|~2.4"
},
"conflict": {
"symfony/security": "4.1.0-beta1",
"symfony/var-dumper": "<3.4",
"symfony/event-dispatcher": "<3.4",
"symfony/framework-bundle": "<3.4",