projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fa6cb0 6336e77)
Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 13 Sep 2011 21:35:34 +0000 (23:35 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 13 Sep 2011 21:35:34 +0000 (23:35 +0200)
1  2 
CHANGES patch | diff1 | diff2 | blob | history

diff --cc CHANGES
Simple merge
The Jinja2 template engine, with 2to3 already run