projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27f44bf 70d90be)
Merge remote branch 'hason/template'
authorFabien Potencier <fabien.potencier@gmail.com>
Tue, 12 Apr 2011 05:53:48 +0000 (07:53 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Tue, 12 Apr 2011 05:53:48 +0000 (07:53 +0200)
* hason/template:
  deleted abstract method doDisplay (maintain BC)
  added possibility to customize "display" in the base template class

1  2 
test/Twig/Tests/Node/ModuleTest.php patch | diff1 | diff2 | blob | history
test/Twig/Tests/TemplateTest.php patch | diff1 | diff2 | blob | history

diff --cc test/Twig/Tests/Node/ModuleTest.php
Simple merge
diff --cc test/Twig/Tests/TemplateTest.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.