]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit
Merge branch 'knot-3-dev' into 'master' obs-knot-dns-deve-jq0xxt/deployments/314
authorTomas Krizek <tomas.krizek@nic.cz>
Tue, 22 Oct 2019 09:29:09 +0000 (09:29 +0000)
committerTomas Krizek <tomas.krizek@nic.cz>
Tue, 22 Oct 2019 09:29:09 +0000 (09:29 +0000)
commit78891466c5dbcc74cc3b522d2b4d6ca469089959
treef6b98b6e938bf9aa9b368474aa3e04b64b8ac19d
parentdf8b2306716ed5f44f77dacb4a098e3c7f5de2bc
parent9c7e5965a048d845751c964bcc68ed94e0b381a8
Merge branch 'knot-3-dev' into 'master'

tweak conditionals to work with knot 3.0.dev

See merge request knot/knot-resolver!885