diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 17:58:51 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 17:58:51 -0800 |
commit | 0b36729682ce72401be6aa442cce59b814ed3c01 (patch) | |
tree | 9e7864040a54442fc344206b43a38ced77a7988c /setup.py | |
parent | e3ab8b1de45548f7e9c1fa49e9eac4069cf2346b (diff) | |
parent | 958faab321a9e2204bd7532b1fd33113e49796b3 (diff) | |
download | paramiko-0b36729682ce72401be6aa442cce59b814ed3c01.tar.gz |
Merge branch '1.14' into 1.15
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -87,6 +87,7 @@ setup( 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', ], **kw ) |