aboutsummaryrefslogtreecommitdiff
path: root/urllib3/__init__.py
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-09 23:19:30 +0200
committerDaniele Tricoli <eriol@mornie.org>2015-10-09 23:19:30 +0200
commitcd2a4010a9e1356c36cfb42b57501343c29e2608 (patch)
tree81af3946a53bb27e34e85eb28035ace8c3e7b27e /urllib3/__init__.py
parentebc01af6ebb87c1e27e50b4ea572b8c1a20e70b0 (diff)
parent7db0aa9b18e70f43ef0bfcdec7f223e5b681aaf0 (diff)
downloadpython-urllib3-cd2a4010a9e1356c36cfb42b57501343c29e2608.tar
python-urllib3-cd2a4010a9e1356c36cfb42b57501343c29e2608.tar.gz
merge patched into master
Diffstat (limited to 'urllib3/__init__.py')
-rw-r--r--urllib3/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/urllib3/__init__.py b/urllib3/__init__.py
index 747d09a..86bb71d 100644
--- a/urllib3/__init__.py
+++ b/urllib3/__init__.py
@@ -4,7 +4,7 @@ urllib3 - Thread-safe connection pooling and re-using.
__author__ = 'Andrey Petrov (andrey.petrov@shazow.net)'
__license__ = 'MIT'
-__version__ = '1.11'
+__version__ = '1.12'
from .connectionpool import (