]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d00a40 381d72a)
Merge branch 'master' into 857-lexer-whitespace-performance
authorDavid Lord <davidism@gmail.com>
Mon, 7 Oct 2019 06:28:18 +0000 (23:28 -0700)
committerGitHub <noreply@github.com>
Mon, 7 Oct 2019 06:28:18 +0000 (23:28 -0700)
1  2 
jinja2/lexer.py patch | diff1 | diff2 | blob | history

diff --cc jinja2/lexer.py
Simple merge
Mirror of https://github.com/pallets/jinja.git