From: Fabien Potencier Date: Tue, 12 Apr 2011 05:53:48 +0000 (+0200) Subject: Merge remote branch 'hason/template' X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=9c17a51fe4dd14b158739893852ddfd4e0b02ea1;p=web%2Fkonrad%2Ftwig.git Merge remote branch 'hason/template' * hason/template: deleted abstract method doDisplay (maintain BC) added possibility to customize "display" in the base template class --- 9c17a51fe4dd14b158739893852ddfd4e0b02ea1