Merge branch '4.0' into 4.1

* 4.0: Fix dep
2018-05-16 17:17:48 +02:00 · 2018-05-16 17:17:48 +02:00 · 87a29f76a5
commit 87a29f76a5
parent 71a1e29c82 2f07052c25
1 changed files with 1 additions and 0 deletions
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@ -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": "<4.1",