]> 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: e005f97 ff2af7b)
Merge !93: fixup the previous merge
authorVladimír Čunát <vladimir.cunat@nic.cz>
Mon, 12 Dec 2016 11:59:11 +0000 (12:59 +0100)
committerVladimír Čunát <vladimir.cunat@nic.cz>
Mon, 12 Dec 2016 11:59:11 +0000 (12:59 +0100)

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