projects / web/konrad/twig.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5402a65 1b5bf91)
merged branch fabpot/complex-template_from_string (PR #1154)
authorFabien Potencier <fabien.potencier@gmail.com>
Sun, 4 Aug 2013 13:01:42 +0000 (15:01 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Sun, 4 Aug 2013 13:01:42 +0000 (15:01 +0200)
commit4e7094f6a3831dc86b4963d805c4567f4076fce3
tree9d0748020f8ca333ed8328137f18c3db404f9c05tree | snapshot
parent5402a658d583c3d6501fa62f20fa1068163b6558commit | diff
parent1b5bf91011c40b3ae40f389ee39d6c052d3fd718commit | diff
merged branch fabpot/complex-template_from_string (PR #1154)

This PR was merged into the master branch.

Discussion
----------

fixed template_from_string when the template includes or extends other ones

This should fix #1134

Commits
-------

1b5bf91 fixed template_from_string when the template includes or extends other ones
CHANGELOG diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.