]> 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: 2a034f9 82fd967)
Merge branch '1.2.4-dev' into '1.2'
authorOndřej Surý <ondrej.sury@nic.cz>
Wed, 8 Mar 2017 12:00:08 +0000 (13:00 +0100)
committerOndřej Surý <ondrej.sury@nic.cz>
Wed, 8 Mar 2017 12:00:08 +0000 (13:00 +0100)
1.2.4 dev

See merge request !227


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