summaryrefslogtreecommitdiffhomepage
path: root/sites/www/changelog.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-22 18:24:48 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-03-22 18:24:48 -0700
commitea88fad0f14a5e2652f6e5c8ced4575ed72df584 (patch)
tree14be58dc9d3868d3cb234f5a4693b33acd5d9001 /sites/www/changelog.rst
parent50598d35a1642346443bf9078cd511ed732dcf41 (diff)
parent4d76a909851e2cc55f5bfca74e07af2552f102c1 (diff)
Merge branch '1.12' into 1.13
Diffstat (limited to 'sites/www/changelog.rst')
-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 ade79cc5..a3558111 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