projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 086174c ef30ab5)
Merge pull request #33 from razamatan/master
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 24 May 2011 15:50:55 +0000 (08:50 -0700)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 24 May 2011 15:50:55 +0000 (08:50 -0700)
jinja.vim subsumes htmljinja.vim


Trivial merge
The Jinja2 template engine, with 2to3 already run