From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sat, 3 Aug 2013 15:15:16 +0000 (+0200)
Subject: merged branch h2s/embed-error-line (PR #1140)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=e3e366928b9bcb37f20461fcbe99ea8be70670f0;p=web%2Fkonrad%2Ftwig.git

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
---

e3e366928b9bcb37f20461fcbe99ea8be70670f0