projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


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