]> 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: f1927ea d709d6d)
lib/utils: Merge conflicts were resolved
authorGrigorii Demidov <grigorii.demidov@nic.cz>
Mon, 23 Jan 2017 11:11:44 +0000 (12:11 +0100)
committerGrigorii Demidov <grigorii.demidov@nic.cz>
Mon, 23 Jan 2017 11:11:44 +0000 (12:11 +0100)

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