Fabien Potencier e3e366928b merged branch h2s/embed-error-line (PR #1140) ...

This PR was squashed before being merged into the master branch (closes #1140).

Discussion
----------

Fix for {% embed %} error line number bug

This deals with issue #958. I've gone into a lot of detail about the fix itself in the commit message for 12cc0a0, so I won't repeat any of that here. Take a look and let me know what you think!

Commits
-------

270b791 Fix for {% embed %} error line number bug

2013-08-03 17:15:16 +02:00

..

Twig/Tests

merged branch h2s/embed-error-line (PR #1140)

2013-08-03 17:15:16 +02:00

bootstrap.php

Fixed autoloader registration for tests if phpunit is installed as package together with Twig

2013-04-22 23:29:01 +02:00