projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4743dc 16dc94e)
merged branch arthens/master (PR #916)
authorFabien Potencier <fabien.potencier@gmail.com>
Mon, 26 Nov 2012 10:25:04 +0000 (11:25 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Mon, 26 Nov 2012 10:25:04 +0000 (11:25 +0100)
This PR was merged into the master branch.

Commits
-------

16dc94e Fix broken variable reference

Discussion
----------

Fix broken variable reference

The exception message is referencing a non-existing variable $token, renamed to $tokens.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.