projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c63243e 8090986)
Automated merge with ssh://team@pocoo.org/jinja2-main
authorArmin Ronacher <armin.ronacher@active-4.com>
Mon, 14 Apr 2008 20:55:32 +0000 (22:55 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Mon, 14 Apr 2008 20:55:32 +0000 (22:55 +0200)
--HG--
branch : trunk

1  2 
jinja2/compiler.py patch | diff1 | diff2 | blob | history

diff --cc jinja2/compiler.py
Simple merge
The Jinja2 template engine, with 2to3 already run