projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc3a7e8 33539fc)
merged branch javiereguiluz/master (PR #923)
authorFabien Potencier <fabien.potencier@gmail.com>
Thu, 6 Dec 2012 20:30:34 +0000 (21:30 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Thu, 6 Dec 2012 20:30:34 +0000 (21:30 +0100)
This PR was merged into the master branch.

Commits
-------

33539fc Fixed a typo in the 'escape' filter documentation.

Discussion
----------

Fixed a typo in the 'escape' filter documentation.

This typo prevents the proper rendering of one code block.


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