diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:33:45 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-19 14:33:45 -0800 |
| commit | ec3fdd72dba89626635e5ea1c31ac65a31091042 (patch) | |
| tree | 043da5ecf08a14c1bee58ac055f3672e51108d8f /sites/www | |
| parent | a6b7648d93eb36d8e52b5761604b187d02bc1b5a (diff) | |
| parent | 5f08308ffd13e952d65f780f6f9b74379d8b868a (diff) | |
Merge branch '2.0' into 2.1
# Conflicts:
# sites/www/changelog.rst
Diffstat (limited to 'sites/www')
| -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 0aeb5961..dcafab78 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.1.1 <2016-12-12>` * :release:`2.0.4 <2016-12-12>` * :release:`1.18.1 <2016-12-12>` |