]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 044e40b ad2d90e)
Merge pull request #700 from brunodoamaral/patch-1
authorDavid Lord <davidism@gmail.com>
Wed, 5 Apr 2017 14:26:08 +0000 (07:26 -0700)
committerGitHub <noreply@github.com>
Wed, 5 Apr 2017 14:26:07 +0000 (07:26 -0700)
Fixed incorrect merge in setup.py


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