diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-06-09 14:07:17 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-06-09 14:07:17 -0700 |
| commit | 7fe437366c88a2607ebf4adbd0186baca05a55ad (patch) | |
| tree | 3c429a06963b033c821f0fdba8b9775e371a74aa /sites/www | |
| parent | 645c540d9bc489a77efb5b17d92ff4d59cf62f80 (diff) | |
| parent | 2cc90f2c38cbfd80db28fdd33b0a5134a613f1eb (diff) | |
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 14b25429..eb568f33 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,8 @@ Changelog ========= +* :support:`906 (1.18+)` Clean up a handful of outdated imports and related + tweaks. Thanks to Pierce Lopez. * :bug:`984` Enhance default cipher preference order such that ``aes(192|256)-cbc`` are preferred over ``blowfish-cbc``. Thanks to Alex Gaynor. |