]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf21539 7c3b7ca)
Merge branch '2.10.x' into 2.11.x 2.11.x
authorDavid Lord <davidism@gmail.com>
Fri, 11 Mar 2022 22:26:34 +0000 (14:26 -0800)
committerDavid Lord <davidism@gmail.com>
Fri, 11 Mar 2022 22:26:34 +0000 (14:26 -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