]> git.ipfire.org Git - thirdparty/unbound.git/commitdiff
projects / thirdparty / unbound.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63b92ea 69f0adf)
Merge branch 'master' into infra-keep-probing
authorW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Mon, 27 Jul 2020 11:16:39 +0000 (13:16 +0200)
committerW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Mon, 27 Jul 2020 11:16:39 +0000 (13:16 +0200)
1  2 
doc/example.conf.in patch | diff1 | diff2 | blob | history
doc/unbound.conf.5.in patch | diff1 | diff2 | blob | history

diff --cc doc/example.conf.in
Simple merge
diff --cc doc/unbound.conf.5.in
Simple merge
Mirror of https://github.com/NLnetLabs/unbound.git