diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:33:18 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:33:18 -0800 |
| commit | 5f08308ffd13e952d65f780f6f9b74379d8b868a (patch) | |
| tree | 5aa37f26527a6ea081d34fa8fb310d5e0389752b /sites | |
| parent | 51cafed29a8b87f58718f55a449a8c4e499addb4 (diff) | |
| parent | 964cb2f122c5cb6776177f099d1d8cdebd849812 (diff) | |
Merge branch '1.18' into 2.0
# Conflicts:
# sites/www/changelog.rst
# tox-requirements.txt
# tox.ini
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 007a3343..3ed75e27 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:`2.0.4 <2016-12-12>` * :release:`1.18.1 <2016-12-12>` * :bug:`859` (via :issue:`860`) A tweak to the original patch implementing |