]> 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: b8eb84a ac272dc)
Merge branch 'release-1.2.6' into 'master' v1.2.6
authorOndřej Surý <ondrej.sury@nic.cz>
Mon, 24 Apr 2017 14:13:02 +0000 (16:13 +0200)
committerOndřej Surý <ondrej.sury@nic.cz>
Mon, 24 Apr 2017 14:13:02 +0000 (16:13 +0200)
NEWS: prepare for 1.2.6

See merge request !280


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