Merge branch '1.x' into 2.x

* 1.x:
  Fix Twig\Environment alias
This commit is contained in:
Fabien Potencier
2017-06-01 06:51:40 -07:00
+1 -1
View File
@@ -5,7 +5,7 @@ namespace Twig;
require __DIR__.'/../lib/Twig/Environment.php';
if (\false) {
class Twig extends \Twig_Environment
class Environment extends \Twig_Environment
{
}
}