diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-22 18:24:37 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-22 18:24:37 -0700 |
commit | 4d76a909851e2cc55f5bfca74e07af2552f102c1 (patch) | |
tree | b19c9a325c1e7ed7154f3c4f9cf0e4459716a2bc /sites/www | |
parent | d4e98d8d77dd34ccd6e14a9febf8b26439f5c350 (diff) | |
parent | bd81c94825747f082c9c066abab8136d9831a3f2 (diff) |
Merge branch '1.11' into 1.12
Diffstat (limited to 'sites/www')
-rw-r--r-- | sites/www/changelog.rst | 2 |
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 |