]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 10:09:44 +0000 (11:09 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 10:09:44 +0000 (11:09 +0100)
commit0a6f850d9a4e53950cd89cfec5c91a5a082ed7af
treea5dbe0793473107149e756ccb4d965a940536d61
parentf3acf0b7b37876775a6f4d8bb3b9b8469c693ba9
parent604752bb83da3290095e8456e0f03fc662e7c24b
Merge branch 'master' of github.com:mitsuhiko/jinja2
docs/templates.rst