]> 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: 5874a1c c428686)
Merge branch 'master' into ad-refactor
authorVladimír Čunát <vladimir.cunat@nic.cz>
Tue, 4 Apr 2017 09:51:47 +0000 (11:51 +0200)
committerVladimír Čunát <vladimir.cunat@nic.cz>
Tue, 4 Apr 2017 09:51:47 +0000 (11:51 +0200)
1  2 
lib/layer/iterate.c patch | diff1 | diff2 | blob | history

diff --cc lib/layer/iterate.c
Simple merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git