projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 081b26c 92b0ec4)
Merge remote branch 'markstory/ticket-277'
authorFabien Potencier <fabien.potencier@gmail.com>
Mon, 21 Mar 2011 18:24:59 +0000 (19:24 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Mon, 21 Mar 2011 18:24:59 +0000 (19:24 +0100)
* markstory/ticket-277:
  Updating documentation for blocks, mentioning that block names cannot contain -.  Fixes #277

1  2 
doc/templates.rst patch | diff1 | diff2 | blob | history

diff --cc doc/templates.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.