Merge branch '7.0' into 7.1

* 7.0:
  [AssetMapper] Adding `{% block importmap %}` in v6.4

Author: javiereguiluz

frontend/asset_mapper.rst

@@ -44,7 +44,7 @@ It also *updated* the ``templates/base.html.twig`` file:
 .. code-block:: diff
 
     {% block javascripts %}
-    +    {{ importmap('app') }}
+    +    {% block importmap %}{{ importmap('app') }}{% endblock %}
     {% endblock %}
 
 If you're not using Flex, you'll need to create & update these files manually. See