projects / web/konrad/twig.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e8be092 3bc113b)
merged branch stof/include_escaping (PR #1110)
authorFabien Potencier <fabien.potencier@gmail.com>
Wed, 29 May 2013 14:58:12 +0000 (16:58 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Wed, 29 May 2013 14:58:12 +0000 (16:58 +0200)
commitfca6a9562dc032a7ba3ab8278b731b72efa8bd9c
tree38785421c755a8aa2c203009ae2fa062065c1115tree | snapshot
parente8be092e18501d7a721b0ad1220f7d74d5c2a863commit | diff
parent3bc113be2a46619fd792346c226aec3edf5e1f00commit | diff
merged branch stof/include_escaping (PR #1110)

This PR was merged into the master branch.

Discussion
----------

Made the include function safe for the autoescaping

This fixes a regression introduced in ba88c75557
Fixes #1097

I have not updated the changelog as the regression is not part of a release yet

Commits
-------

3bc113b Made the include function safe for the autoescaping
Unnamed repository; edit this file 'description' to name the repository.