]> granicus.if.org Git - pdns/commitdiff
projects / pdns / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a0c9ee 2be1beb)
Merge pull request #992 from zeha/ws
authorPeter van Dijk <peter@7bits.nl>
Fri, 6 Sep 2013 08:06:21 +0000 (01:06 -0700)
committerPeter van Dijk <peter@7bits.nl>
Fri, 6 Sep 2013 08:06:21 +0000 (01:06 -0700)
Land json webserver changes

1  2 
pdns/docs/pdns.xml patch | diff1 | diff2 | blob | history

diff --cc pdns/docs/pdns.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.