]> git.ipfire.org Git - thirdparty/dnspython.git/commitdiff
projects / thirdparty / dnspython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8737801 341444f)
Merge pull request #202 from m3047/master
authorBob Halley <halley@play-bow.org>
Mon, 19 Sep 2016 17:06:18 +0000 (10:06 -0700)
committerGitHub <noreply@github.com>
Mon, 19 Sep 2016 17:06:18 +0000 (10:06 -0700)
DWIMmmy

1  2 
dns/resolver.py patch | diff1 | diff2 | blob | history
tests/test_resolver.py patch | diff1 | diff2 | blob | history

diff --cc dns/resolver.py
Simple merge
diff --cc tests/test_resolver.py
Simple merge
Mirror of https://github.com/rthalley/dnspython.git