added documentation for the merge filter
authorFabien Potencier <fabien.potencier@gmail.com>
Thu, 16 Dec 2010 08:07:55 +0000 (09:07 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Thu, 16 Dec 2010 08:07:55 +0000 (09:07 +0100)
commit78b104bfc3d31bbafa98fa44246ce23c2a089cfa
treefdb288dbc6f14d048196063ab0b6936b23ffe23f
parentb79238212657d3d2fb0829f5fc1472534edc3a0b
added documentation for the merge filter
doc/templates.rst