summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-08-25 22:45:07 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-08-25 22:45:07 -0700
commitbc07b04e8ed4ddf9e97cf80cf39021828b94b3cf (patch)
treefa760f0407e32c2280d7737411acfa300a6641af /sites/www
parenta22bf77030acaa476512752a2862244e90a3f1b6 (diff)
parent12e752d11aa22ee6ba959115725e386ca779c1cb (diff)
Merge branch '1.13' into 1.14
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 5b8e1702..82076178 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :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' ``..
versionadded::`` RST directives. Thanks to Aarni Koskela for the catch.
* :support:`169 backported` Minor refactor of