]> 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: 1590015 cbfb170)
Merge branch '1.2' into 'master'
authorOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 14:10:22 +0000 (16:10 +0200)
committerOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 14:10:22 +0000 (16:10 +0200)
Sync 1.2 branch to master

See merge request !268


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