projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bac4974 0ef1cb0)
merged branch videlalvaro/patch-1 (PR #419)
authorFabien Potencier <fabien.potencier@gmail.com>
Thu, 18 Aug 2011 17:16:29 +0000 (19:16 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Thu, 18 Aug 2011 17:16:29 +0000 (19:16 +0200)
Commits
-------

0ef1cb0 Edited doc/templates.rst via GitHub

Discussion
----------

Edited doc/templates.rst via GitHub

I fixed a typo: Variables can by for Variables can be


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