projects / platform / upstream / python-requests.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cac72b 1d42d9d)
Merge pull request #1770 from kmadac/master
authorKenneth Reitz <me@kennethreitz.org>
Thu, 5 Dec 2013 22:40:44 +0000 (14:40 -0800)
committerKenneth Reitz <me@kennethreitz.org>
Thu, 5 Dec 2013 22:40:44 +0000 (14:40 -0800)
Implemetation of IP address ranges for no_proxy environment variable

1  2 
requests/utils.py patch | diff1 | diff2 | blob | history
test_requests.py patch | diff1 | diff2 | blob | history

diff --cc requests/utils.py
Simple merge
diff --cc test_requests.py
Simple merge
Domain: System / Base;