]> 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: 8327f0f 80914f0)
Merge remote-tracking branch 'origin/master' into 1.2
authorOndřej Surý <ondrej@sury.org>
Wed, 5 Apr 2017 09:44:50 +0000 (11:44 +0200)
committerOndřej Surý <ondrej@sury.org>
Wed, 5 Apr 2017 09:44:50 +0000 (11:44 +0200)

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