summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2015-11-02 18:01:35 -0800
committerJeff Forcier <jeff@bitprophet.org>2015-11-02 18:01:35 -0800
commit2688100402a949816be9019e84cc6877693fc6ce (patch)
treeb5bbb4efafaa987abffb9d8e44faad5ab474198e /sites/www
parent296cf408ce05e154f0985ab310ed6bcdbcda4571 (diff)
parentd37c68673396b247c08d0d5122bb012e9c3c46c3 (diff)
Merge branch '1.15'
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 c2c8e78a..b2472e44 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :release:`1.15.4 <2015-11-02>`
+* :release:`1.14.3 <2015-11-02>`
* :release:`1.13.4 <2015-11-02>`
* :bug:`366` Fix `~paramiko.sftp_attributes.SFTPAttributes` so its string
representation doesn't raise exceptions on empty/initialized instances. Patch