]> 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: 4486aa5 502920d)
tests: test_cache.c conflict fixed
authorGrigorii Demidov <grigorii.demidov@nic.cz>
Mon, 1 Jun 2015 10:18:33 +0000 (12:18 +0200)
committerGrigorii Demidov <grigorii.demidov@nic.cz>
Mon, 1 Jun 2015 10:18:33 +0000 (12:18 +0200)

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