]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5eea6e4 cc792d8)
Merge pull request #1241 from MLH-Fellowship/macros_with_globals
authorDavid Lord <davidism@gmail.com>
Mon, 22 Jun 2020 17:12:46 +0000 (10:12 -0700)
committerGitHub <noreply@github.com>
Mon, 22 Jun 2020 17:12:46 +0000 (10:12 -0700)
Fix bug with imported macros and template globals


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