]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit
Merge branch 'master' into policy-reserved-domains
authorVladimír Čunát <vladimir.cunat@nic.cz>
Tue, 11 Jul 2017 12:50:14 +0000 (14:50 +0200)
committerVladimír Čunát <vladimir.cunat@nic.cz>
Tue, 11 Jul 2017 12:50:14 +0000 (14:50 +0200)
commita2f929a7f171c4550985c760e3745fae6a8f817f
tree69a5c5729c78e163e31a5a9b1ffad5af184811d7
parentbd3ba69b96089722085eb44213c9e77c8540e7cb
parentd8fed142d6c74b4e2760b95bfa5a45f2f89ab910
Merge branch 'master' into policy-reserved-domains

... to fix conflict in a generated lua file
daemon/lua/kres-gen.lua
daemon/lua/kres-gen.sh