]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit
Merge branch 'master' into hints-name-order
authorVladimír Čunát <vladimir.cunat@nic.cz>
Mon, 24 Jul 2017 09:09:15 +0000 (11:09 +0200)
committerVladimír Čunát <vladimir.cunat@nic.cz>
Mon, 24 Jul 2017 09:09:15 +0000 (11:09 +0200)
commit403660e4f8163b804251ae5d788979dd04f962de
treea4ebed3192a04a482cf8e5686ce059caf964d2a4
parentffdd55a9a7e20369fdb1ae354d94217c538bccb5
parentda26b5472254976f56c25b749663adeb2cb11067
Merge branch 'master' into hints-name-order

... to fix conflict in NEWS.
NEWS