]> 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: 266410c 01ee9f3)
Merge branch 'cached-insecure-delegs'
authorMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 3 Dec 2015 14:14:27 +0000 (15:14 +0100)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 3 Dec 2015 14:14:27 +0000 (15:14 +0100)

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