]> 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: 80914f0 966c842)
Merge branch '1.2-merge-master' into 'master'
authorOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 09:53:35 +0000 (11:53 +0200)
committerOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 09:53:35 +0000 (11:53 +0200)
1.2 merge master

Closes #158, #160, and #151

See merge request !257


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