]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 067f0c4 3223751)
Merge branch 'lkarthee-pytest_migration'
authorMarkus Unterwaditzer <markus@unterwaditzer.net>
Sun, 22 Mar 2015 12:48:17 +0000 (13:48 +0100)
committerMarkus Unterwaditzer <markus@unterwaditzer.net>
Sun, 22 Mar 2015 12:48:17 +0000 (13:48 +0100)

Trivial merge
Mirror of https://github.com/pallets/jinja.git