diff options
| author | Anselm Kruis <a.kruis@science-computing.de> | 2014-05-28 00:14:51 +0200 |
|---|---|---|
| committer | Anselm Kruis <a.kruis@science-computing.de> | 2014-05-28 00:14:51 +0200 |
| commit | 8904c15316fbd4dc58f1903479ad559c7677dc2b (patch) | |
| tree | 5f457c09de34951af591fbfaddcff6260d063a27 /paramiko/__init__.py | |
| parent | ce87fc8d7a8a025671183fc78091e5d1f6760f5f (diff) | |
| parent | e811e715833373dd2f2ba898089695eee9c882ed (diff) | |
| download | paramiko-8904c15316fbd4dc58f1903479ad559c7677dc2b.tar.gz | |
Merge branch 'master' into gssapi-py3-support
Conflicts:
dev-requirements.txt
sites/www/changelog.rst
Diffstat (limited to 'paramiko/__init__.py')
| -rw-r--r-- | paramiko/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py index f4ce937b..6d133c4b 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -23,7 +23,7 @@ if sys.version_info < (2, 6): __author__ = "Jeff Forcier <jeff@bitprophet.org>" -__version__ = "1.13.0" +__version__ = "1.14.0" __version_info__ = tuple([ int(d) for d in __version__.split(".") ]) __license__ = "GNU Lesser General Public License (LGPL)" |