diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-08-26 00:14:06 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-08-26 00:14:06 -0700 |
| commit | e7e4ab3f8e44b88eaed494a911ef9ef4204cc415 (patch) | |
| tree | 25955b3310dd60c9d2376fca225899a7f77f7fcf /sites/www | |
| parent | 1bafe0a1b9fc8e0d4b1c025c5a11b96c525f26f1 (diff) | |
| parent | 12cc48839c607fe51e4b3c672bb91594725d2747 (diff) | |
Merge branch '1.14'
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index b6fa7ccc..ebccc72d 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -21,7 +21,7 @@ Changelog report. * :bug:`239` Add Windows-style CRLF support to SSH config file parsing. Props to Christopher Swenson. -* :support:`229` Fix a couple of incorrectly-copied docstrings' ``.. +* :support:`229 backported` Fix a couple of incorrectly-copied docstrings' ``.. versionadded::`` RST directives. Thanks to Aarni Koskela for the catch. * :support:`169 backported` Minor refactor of `paramiko.sftp_client.SFTPClient.put` thanks to Abhinav Upadhyay. |