summaryrefslogtreecommitdiff
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-22 18:24:37 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-03-22 18:24:37 -0700
commit4d76a909851e2cc55f5bfca74e07af2552f102c1 (patch)
treeb19c9a325c1e7ed7154f3c4f9cf0e4459716a2bc /sites
parentd4e98d8d77dd34ccd6e14a9febf8b26439f5c350 (diff)
parentbd81c94825747f082c9c066abab8136d9831a3f2 (diff)
downloadparamiko-4d76a909851e2cc55f5bfca74e07af2552f102c1.tar.gz
Merge branch '1.11' into 1.12
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst2
1 files changed, 0 insertions, 2 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 88caba6c..acf20c59 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,8 +2,6 @@
Changelog
=========
-* :support:`290` Add a ``setup.cfg`` marking Paramiko as 'universal' when
- generating wheel files. Courtesy of Alex Gaynor.
* :support:`284` Add Python language trove identifiers to ``setup.py``. Thanks
to Alex Gaynor for catch & patch.
* :bug:`235` Improve string type testing in a handful of spots (e.g. ``s/if