]> 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: 2800e37 22e8b6d)
Merge branch 'deck_test'
authorMarek Vavrusa <marek@vavrusa.com>
Thu, 21 Jan 2016 05:20:47 +0000 (21:20 -0800)
committerMarek Vavrusa <marek@vavrusa.com>
Thu, 21 Jan 2016 05:20:47 +0000 (21:20 -0800)

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