projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6445fb e2a068d)
merged branch lyrixx/patch-5 (PR #989)
authorFabien Potencier <fabien.potencier@gmail.com>
Fri, 8 Feb 2013 16:34:13 +0000 (17:34 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Fri, 8 Feb 2013 16:34:13 +0000 (17:34 +0100)
This PR was merged into the master branch.

Commits
-------

e2a068d [Doc] Updated template_from_string to use include function

Discussion
----------

[Doc] Updated template_from_string to use include function

instead of include tag


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