]> 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: 934f3f7 6df499a)
Merge branch 'master' of gitlab.labs.nic.cz:knot/resolver
authorGrigorii Demidov <grigorii.demidov@nic.cz>
Fri, 27 Nov 2015 12:25:09 +0000 (13:25 +0100)
committerGrigorii Demidov <grigorii.demidov@nic.cz>
Fri, 27 Nov 2015 12:25:09 +0000 (13:25 +0100)

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