]> 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: bb0c707 4b7d121)
Merge branch 'supervisor'
authorMarek Vavrusa <marek@vavrusa.com>
Tue, 29 Mar 2016 05:09:29 +0000 (22:09 -0700)
committerMarek Vavrusa <marek@vavrusa.com>
Tue, 29 Mar 2016 05:09:29 +0000 (22:09 -0700)

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