Merge branch '4.1' into 4.2

nicolas-grekas · nicolas-grekas · commit 0f947130f2bf · 2019-01-25T16:37:00.000+01:00
* 4.1:
  fix merge
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -43,7 +43,7 @@
     },
     "conflict": {
         "symfony/console": "<3.4",
-        "symfony/form": "<4.2",
+        "symfony/form": "<4.2.3",
         "symfony/translation": "<4.2"
     },
     "suggest": {
