summaryrefslogtreecommitdiffhomepage
path: root/sites
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
commit4e7c1bba50ac92faa92ba22bc5ce255032cd64bb (patch)
tree8508e5108645dbf09d48b9f6771039a75838643b /sites
parent239ee3716fb245ff905110295494f4a7b5c24688 (diff)
parentbc07b04e8ed4ddf9e97cf80cf39021828b94b3cf (diff)
Merge branch '1.14'
Diffstat (limited to 'sites')
-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 fa85f4c7..c670d140 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