From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Tue, 22 Oct 2019 09:29:09 +0000 (+0000)
Subject: Merge branch 'knot-3-dev' into 'master'
X-Git-Tag: v4.3.0~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fenvironments%2Fobs-knot-dns-deve-jq0xxt%2Fdeployments%2F314;p=thirdparty%2Fknot-resolver.git

Merge branch 'knot-3-dev' into 'master'

tweak conditionals to work with knot 3.0.dev

See merge request knot/knot-resolver!885
---

78891466c5dbcc74cc3b522d2b4d6ca469089959