]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge branch 'PaulosV-patch-1-readme-docker' of https://github.com/PaulosV/knot-resol...
authorMarek Vavrusa <marek@vavrusa.com>
Wed, 6 Apr 2016 17:27:27 +0000 (10:27 -0700)
committerMarek Vavrusa <marek@vavrusa.com>
Wed, 6 Apr 2016 17:27:27 +0000 (10:27 -0700)
1  2 
README.md

diff --cc README.md
Simple merge