summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-21 11:23:06 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-03-21 11:23:06 -0700
commit3780c0314c7f4bf5f6bf4fb0f0099cc22c1dcc0a (patch)
tree1d3eddf460b484333a70b8e7223c3291b4244c78
parent4ba5ae61351dc9e1f9cc2eaef382276f8074d23c (diff)
parent2c0544fc3504de0bb4d9c51e17abd384514030dd (diff)
Merge branch '1.11' into 1.12
-rw-r--r--sites/www/changelog.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index eaf74441..acf20c59 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :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
type(x) is str/if isinstance(x, basestring)/g``.) Thanks to ``@ksamuel`` for
the report.