Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit e827b51352d8 · 2018-10-19T16:55:21.000+02:00
* 3.4:
  Fix base.html.twig path
diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.rst
@@ -82,7 +82,7 @@ your layout. In Symfony, use the ``asset()`` helper:
 
 .. code-block:: twig
 
-    {# templates/base.html.twig #}
+    {# app/Resources/views/base.html.twig #}
     <!DOCTYPE html>
     <html>
         <head>
