Merge branch '5.0' into 5.1

javiereguiluz · javiereguiluz · commit 97a96c8224a1 · 2020-06-04T15:32:22.000+02:00
* 5.0:
  Update information in flex about added files for twig
diff --git a/quick_tour/flex_recipes.rst b/quick_tour/flex_recipes.rst
@@ -61,8 +61,8 @@ What did this recipe do? In addition to automatically enabling the feature in
 ``config/packages/twig.yaml``
     A configuration file that sets up Twig with sensible defaults.
 
-``config/routes/dev/twig.yaml``
-    A route that helps you debug your error pages.
+``config/packages/test/twig.yaml``
+    A configuration file that changes some Twig options when running tests.
 
 ``templates/``
     This is the directory where template files will live. The recipe also added
