]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit
Merge branch 'master' into 6.0 docs-develop-6-0-mvwoqi/deployments/3227
authorVladimír Čunát <vladimir.cunat@nic.cz>
Mon, 12 Feb 2024 13:06:28 +0000 (14:06 +0100)
committerVladimír Čunát <vladimir.cunat@nic.cz>
Mon, 12 Feb 2024 13:06:28 +0000 (14:06 +0100)
commit4410e100833d31e0033b727c38aa1772deef8e5f
tree6c8ad08e007f5ad14b751b7f2c42997ae71b76da
parent3c2052f893dcace799f6a464a6ec300a2364bf28
parent087d62c1ad9fe2e5f6a5d3ce603c98736f726fc0
Merge branch 'master' into 6.0

There were some conflicts with !1495