]> 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: c1dfb05 0cb9fe6)
Merge branch 'daemon-doc-typo' of https://github.com/thozza/knot-resolver into thozza...
authorMarek Vavrusa <marek@vavrusa.com>
Wed, 6 Apr 2016 17:25:58 +0000 (10:25 -0700)
committerMarek Vavrusa <marek@vavrusa.com>
Wed, 6 Apr 2016 17:25:58 +0000 (10:25 -0700)
1  2 
daemon/README.rst patch | diff1 | diff2 | blob | history

diff --cc daemon/README.rst
Simple merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git