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 | 12cc48839c607fe51e4b3c672bb91594725d2747 (patch) | |
| tree | 0d49cffff6060970b8d1268cee3bf8e253b15fd5 | |
| parent | c916ad664cccf4bdcb936d7f4bffd656cefbe621 (diff) | |
| parent | 9014c735fc94d133c5d9aada93d43f1f5d1145f2 (diff) | |
Merge branch '1.13' into 1.14
| -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 0fcde10f..0bed707b 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -19,7 +19,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. |