diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:32:20 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:32:20 -0800 |
| commit | 964cb2f122c5cb6776177f099d1d8cdebd849812 (patch) | |
| tree | 9e99bef11f9b118f3cf5f94301179e777276b918 /sites | |
| parent | 4300732c8c392cb246fc7b2839e3700732846fff (diff) | |
| parent | f52a68eff3a1a58e4ccbf45f9d8a48cf9021c1ac (diff) | |
Merge branch '1.17' into 1.18
# Conflicts:
# sites/www/changelog.rst
Diffstat (limited to 'sites')
| -rw-r--r-- | sites/www/changelog.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 7fb3542b..460637f9 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,9 @@ Changelog ========= +* :support:`866 backported` (also :issue:`838`) Remove an old test-related file + we don't support, and add PyPy to Travis-CI config. Thanks to Pierce Lopez + for the final patch and Pedro Rodrigues for an earlier edition. * :release:`1.18.1 <2016-12-12>` * :bug:`859` (via :issue:`860`) A tweak to the original patch implementing :issue:`398` was not fully applied, causing calls to |