]> 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: cdc47cb a6a69bc)
Merge branch 'deckard-update' into 'master'
authorOndřej Surý <ondrej.sury@nic.cz>
Mon, 24 Apr 2017 13:21:08 +0000 (15:21 +0200)
committerOndřej Surý <ondrej.sury@nic.cz>
Mon, 24 Apr 2017 13:21:08 +0000 (15:21 +0200)
Update deckard to latest master

See merge request !279


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