]> 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: 322022d d4fdfd8)
Merge branch 'master' into cache-NSEC3
authorVladimír Čunát <vladimir.cunat@nic.cz>
Fri, 22 Jun 2018 09:14:00 +0000 (11:14 +0200)
committerVladimír Čunát <vladimir.cunat@nic.cz>
Fri, 22 Jun 2018 09:14:00 +0000 (11:14 +0200)
1  2 
NEWS patch | diff1 | diff2 | blob | history

diff --cc NEWS
Simple merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git