]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 681f8de aa3d688)
Merge branch '2.11.x' into 3.0.x 3.0.x
authorDavid Lord <davidism@gmail.com>
Fri, 11 Mar 2022 22:37:22 +0000 (14:37 -0800)
committerDavid Lord <davidism@gmail.com>
Fri, 11 Mar 2022 22:37:22 +0000 (14:37 -0800)
1  2 
docs/faq.rst patch | diff1 | diff2 | blob | history

diff --cc docs/faq.rst
Simple merge
Mirror of https://github.com/pallets/jinja.git