projects / web/konrad/twig.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0e63ef0 270b791)
merged branch h2s/embed-error-line (PR #1140)
authorFabien Potencier <fabien.potencier@gmail.com>
Sat, 3 Aug 2013 15:15:16 +0000 (17:15 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Sat, 3 Aug 2013 15:15:16 +0000 (17:15 +0200)
commite3e366928b9bcb37f20461fcbe99ea8be70670f0
tree320222a05b737b505e54d841d00d35475eec297atree | snapshot
parent0e63ef04a00fb238ee457708f8b4e8918aa51d7ecommit | diff
parent270b791ed33d4b11e7c416656985ed9c09eb715ccommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.