Merge branch '3.4' into 4.0
* 3.4: [SecurityBundle] update conflict rule
This commit is contained in:
commit
34bb84be98
@ -44,7 +44,7 @@
|
||||
"twig/twig": "~1.34|~2.4"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/security": "4.1.0-beta1",
|
||||
"symfony/security": "4.1.0-beta1,4.1.0-beta2",
|
||||
"symfony/var-dumper": "<3.4",
|
||||
"symfony/event-dispatcher": "<3.4",
|
||||
"symfony/framework-bundle": "<3.4",
|
||||
|
Reference in New Issue
Block a user