Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 51f36e73a04e · 2018-06-06T11:56:41.000+02:00
* 2.8:
  Remove mentions of "beta" in composer.json files
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -46,7 +46,6 @@
         "twig/twig": "~1.34|~2.4"
     },
     "conflict": {
-        "symfony/security": "4.1.0-beta1|4.1.0-beta2",
         "symfony/var-dumper": "<3.3",
         "symfony/event-dispatcher": "<3.4",
         "symfony/framework-bundle": "<3.4",
diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
@@ -31,7 +31,7 @@
         "psr/log": "~1.0"
     },
     "conflict": {
-        "symfony/security-csrf": "<2.8.41|~3.0,<3.3.17|~3.4,<3.4.11|~4.0,<4.0.11|~4.1,<=4.1.0-beta2"
+        "symfony/security-csrf": "<2.8.41|~3.0,<3.3.17|~3.4,<3.4.11|~4.0,<4.0.11"
     },
     "suggest": {
         "symfony/security-csrf": "For using tokens to protect authentication/logout attempts",
