Merge branch '3.3.x'

2025-08-19 06:51:33 +02:00 · 2020-03-01 21:41:03 +01:00
parent 7945c452ec 3feafaade6
commit e95778df58
25 changed files with 134 additions and 133 deletions
--- a/phpBB/phpbb/template/twig/twig.php
+++ b/phpBB/phpbb/template/twig/twig.php
@@ -69,7 +69,7 @@ class twig extends \phpbb\template\base
 	/**
 	* Twig Environment
 	*
-	* @var \Twig_Environment
+	* @var \Twig\Environment
 	*/
 	protected $twig;