]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch 'master' of github.com:pallets/jinja
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 12 Jan 2017 19:11:22 +0000 (20:11 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 12 Jan 2017 19:11:22 +0000 (20:11 +0100)
commit5c9de9cf075688f40df8ef682a4478d876ea41cf
treeefe2e76351cbf8fe35f7b1570673a62ad5aa2c41
parent05b0a7e4345176a972f8af817ef8c4b851ab19c2
parent414c1d1e62347799a1f60e0a72c27b764b65f0c0
Merge branch 'master' of github.com:pallets/jinja