]> 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: d18e3cc b897789)
Merge branch 'release-1.2.5' into '1.2'
authorOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 09:43:19 +0000 (11:43 +0200)
committerOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 09:43:19 +0000 (11:43 +0200)
Knot Resolver 1.2.5

See merge request !254


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