summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-24 22:11:14 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-24 22:11:14 -0700
commitd7e65c2a4b78dbc8a7801bbd1826c2d2d7ab91c7 (patch)
treebdff521a7d6e69f0690fd19312b10bcd15ca3e0a /sites/www
parent8740474f4dad288632135d38ce04d268a9a8ad65 (diff)
parent6460ee41a0bfed2498b4a89652cb170783ac442d (diff)
Merge branch '1.15' into 1.16
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index eb89a4ee..9afdaa51 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+* :release:`1.15.5 <2016-04-25>`
* :bug:`577` (via :issue:`578`; should also fix :issue:`718`, :issue:`560`) Fix
stalled/hung SFTP downloads by cleaning up some threading lock issues. Thanks
to Stephen C. Pope for the patch.