]> 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: c428686 21b46f4)
Merge branch '1.3.0-dev' into 'master'
authorOndřej Surý <ondrej.sury@nic.cz>
Tue, 4 Apr 2017 13:55:59 +0000 (15:55 +0200)
committerOndřej Surý <ondrej.sury@nic.cz>
Tue, 4 Apr 2017 13:55:59 +0000 (15:55 +0200)
1.3.0 dev

See merge request !252


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