]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge branch 'release-1.2.0' into 'master' v1.2.0
authorOndřej Surý <ondrej.sury@nic.cz>
Wed, 25 Jan 2017 13:16:25 +0000 (14:16 +0100)
committerOndřej Surý <ondrej.sury@nic.cz>
Wed, 25 Jan 2017 13:16:25 +0000 (14:16 +0100)
Knot DNS Release 1.2.0

See merge request !176


Trivial merge