diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2012-11-29 08:35:35 -0800 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2012-11-29 08:35:35 -0800 |
| commit | a5cb6355edd67e25a4a213a3559f9da4ba8d44fc (patch) | |
| tree | f6f2cbbd377c2ec92eacd530faedb5deee8b6f68 /setup.py | |
| parent | 6ead850065189a094687894168abcf99cabe7f02 (diff) | |
| parent | 8f86ff633a2646442f2d8976046b5c0025e772c1 (diff) | |
| download | python-requests-a5cb6355edd67e25a4a213a3559f9da4ba8d44fc.tar.gz | |
Merge branch 'master' of github.com:kennethreitz/requests
Conflicts:
requests/compat.py
setup.py
Diffstat (limited to 'setup.py')
| -rwxr-xr-x | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -17,7 +17,7 @@ if sys.argv[-1] == 'publish': packages = [ 'requests', 'requests.packages', - 'requests.packages.charade' + 'requests.packages.charade', 'requests.packages.urllib3', 'requests.packages.urllib3.packages', 'requests.packages.urllib3.packages.ssl_match_hostname' |