]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
projects / thirdparty / knot-resolver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c2052f 087d62c)
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)
There were some conflicts with !1495


Trivial merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git