Merge branch '1.x' into 2.x

* 1.x:
  Tweaking phpdoc above Environment
  Identity Equals - Best practices
  Update default.rst
This commit is contained in:
Fabien Potencier
2020-03-17 15:09:30 +01:00
3 changed files with 13 additions and 4 deletions
+1 -1
View File
@@ -32,7 +32,7 @@ use Twig\RuntimeLoader\RuntimeLoaderInterface;
use Twig\TokenParser\TokenParserInterface;
/**
* Stores the Twig configuration.
* Stores the Twig configuration and renders templates.
*
* @author Fabien Potencier <fabien@symfony.com>
*/