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)
commit496537a08d83db88b35d07dc9d0b2a254df751a1
tree93a83699bd6e5ed252a8a150f27906848f231c94
parentbc3a7e806f7ed2a5254a6176e7c183a0a6780b2a
parent33539fcab36b465fae78ddfb69a27ade76101949
merged branch javiereguiluz/master (PR #923)

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.