]> 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 f10f3eb)
Merge branch 'master' into 1.2
authorOndřej Surý <ondrej@sury.org>
Tue, 4 Apr 2017 14:31:09 +0000 (16:31 +0200)
committerOndřej Surý <ondrej@sury.org>
Tue, 4 Apr 2017 14:32:03 +0000 (16:32 +0200)

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