Merge branch '3.4' into 4.0

* 3.4: [SecurityBundle] update conflict rule
2018-05-25 11:05:43 +02:00 · 2018-05-25 11:05:43 +02:00 · 34bb84be98
commit 34bb84be98
parent a313a8f8be 531fcacd5f
1 changed files with 1 additions and 1 deletions
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@ -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",