projects / konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 654468f c0447ec)
Merge remote branch 'jpb0104/master'
authorFabien Potencier <fabien.potencier@gmail.com>
Wed, 18 May 2011 06:05:56 +0000 (08:05 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Wed, 18 May 2011 06:05:56 +0000 (08:05 +0200)
* jpb0104/master:
  Added an example of escaped "at" in a date filter.

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.