]> 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: e6e3434 580f7ec)
Merge branch 'cache-api-noglobal-wip' of gitlab.labs.nic.cz:knot/resolver into cache...
authorGrigorii Demidov <grigorii.demidov@nic.cz>
Fri, 29 May 2015 11:12:47 +0000 (13:12 +0200)
committerGrigorii Demidov <grigorii.demidov@nic.cz>
Fri, 29 May 2015 11:12:47 +0000 (13:12 +0200)

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