summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-21 11:23:09 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-03-21 11:23:09 -0700
commit6875bfd795b53108ce5ebd20562c822f90098712 (patch)
tree5afd453aef22f902a4587070f438cb6fa024c281
parent5c4dceae396e9a038e1c2edc3e5e1920b44e18e5 (diff)
parent3780c0314c7f4bf5f6bf4fb0f0099cc22c1dcc0a (diff)
Merge branch '1.12' into 1.13
-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 af4d9418..a3558111 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.