Merge branch '1.x' into 2.x

* 1.x: fixed phpdocs
2026-09-19 13:57:00 +00:00 · 2016-11-15 17:03:16 -05:00
parent 183f062bbf 61bf5da0ac
commit d0d5475dc9
1 changed files with 0 additions and 1 deletions
@@ -281,7 +281,6 @@ abstract class Twig_Template
     * This method checks blocks defined in the current template
     * or defined in "used" traits or defined in parent templates.
     *
-     * @param string $name    The block name
     * @param array  $context The context
     * @param array  $blocks  The current set of blocks
     *