]> 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: d0982bb afcb3e4)
Merge branch 'block-module'
authorMarek Vavruša <marek.vavrusa@nic.cz>
Mon, 22 Jun 2015 11:08:53 +0000 (13:08 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Mon, 22 Jun 2015 11:08:53 +0000 (13:08 +0200)

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