From: David Lord <davidism@gmail.com>
Date: Mon, 1 Nov 2021 19:48:16 +0000 (-0700)
Subject: Merge branch '3.0.x'
X-Git-Tag: 3.1.0~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15f02c471c0253707ef17d54c9fa736bbb95d289;p=thirdparty%2Fjinja.git

Merge branch '3.0.x'
---

15f02c471c0253707ef17d54c9fa736bbb95d289