]> 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: 4332941 1286d1b)
Merge branch 'cherry-pick-2ff4eb98' into '1.2'
authorOndřej Surý <ondrej.sury@nic.cz>
Wed, 8 Mar 2017 12:39:34 +0000 (13:39 +0100)
committerOndřej Surý <ondrej.sury@nic.cz>
Wed, 8 Mar 2017 12:39:34 +0000 (13:39 +0100)
Merge branch 'fix-auth-qname' into '1.2'

See merge request !230


Trivial merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git