projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5218db7 8f28e78)
merged branch eXtreme/patch-1 (PR #978)
authorFabien Potencier <fabien.potencier@gmail.com>
Sun, 27 Jan 2013 16:32:04 +0000 (17:32 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Sun, 27 Jan 2013 16:32:04 +0000 (17:32 +0100)
This PR was merged into the master branch.

Commits
-------

8f28e78 Missing code-block in doc/templates.rst

Discussion
----------

Missing code-block in doc/templates.rst

Little tweak for docs.


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