From: David Lord <davidism@gmail.com>
Date: Wed, 8 Apr 2020 15:53:28 +0000 (-0700)
Subject: Merge branch '2.11.x'
X-Git-Tag: 3.0.0rc1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=169b676a003d4a73846f05618c8d1fedd2a0e402;p=thirdparty%2Fjinja.git

Merge branch '2.11.x'
---

169b676a003d4a73846f05618c8d1fedd2a0e402