]> 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: ada0fd5 1a5dd52)
Merge branch 'hive-wip'
authorMarek Vavruša <marek.vavrusa@nic.cz>
Tue, 30 Jun 2015 22:34:17 +0000 (00:34 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Tue, 30 Jun 2015 22:34:17 +0000 (00:34 +0200)

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