projects / konrad/twig.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit9c17a51fe4dd14b158739893852ddfd4e0b02ea1
tree08910777e306461b447b7b7944b0e5c0e92251ectree | snapshot
parent27f44bfe5427549bf34f5a51a7fc12b2c381a0aecommit | diff
parent70d90bedce7788f5aac35357975aaf6c6a584bafcommit | diff
Merge remote branch 'hason/template'

* hason/template:
  deleted abstract method doDisplay (maintain BC)
  added possibility to customize "display" in the base template class
test/Twig/Tests/Node/ModuleTest.php diff1 | diff2 | blob | history
test/Twig/Tests/TemplateTest.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.