diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-04 16:16:33 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-04 16:16:33 -0800 |
| commit | d5ed558c217170815a373604f30be2bb5cb86f1a (patch) | |
| tree | e965b92b737e50b02aafbdd9d5a6f6ae9febbfa1 /sites/www | |
| parent | 8f22672926bd57a4c89f6e0c41fc6f70ad8b1d4d (diff) | |
| parent | 798e3689dda432e711ca997bd2f18b8b2dec272f (diff) | |
Merge branch '1.10' into 1.11
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 635e1713..19383cdc 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,9 +2,9 @@ Changelog ========= -* :support:`256` Convert API documentation to Sphinx, yielding a new API - docs website to replace the old Epydoc one. Thanks to Olle Lundberg for the - initial conversion work. +* :support:`256 backported` Convert API documentation to Sphinx, yielding a new + API docs website to replace the old Epydoc one. Thanks to Olle Lundberg for + the initial conversion work. * :bug:`-` Use constant-time hash comparison operations where possible, to protect against `timing-based attacks <http://codahale.com/a-lesson-in-timing-attacks/>`_. Thanks to Alex Gaynor |