summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-04-24 22:12:05 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-04-24 22:12:05 -0700
commit0bb52353135a4eca9edf92483beb61041cc526c0 (patch)
tree0c313bbf1f83effd8e77e1aeab29b91a666723e4 /sites
parent04000116ccbe7173b9d8d83fc0c1d5e5b43e32fd (diff)
parent428d270ebfebdec6e4dfc1263b27c3e4ad803670 (diff)
Merge branch '1.16' into 1.17
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 5c11a052..93e346ed 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -3,6 +3,8 @@ Changelog
=========
* :release:`1.17.0 <2016-04-25>`
+* :release:`1.16.1 <2016-04-25>`
+* :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.