summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-05-07 14:16:23 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-05-07 14:16:23 -0700
commit5ec984960bc38ef341d9edacc7d91a4afd9317ee (patch)
treedab96f68e556fa81666b556a0b1f7207001ce61c /sites/www
parent54613b68859353444538015ad7b117f7cb806014 (diff)
parent7484a221803a3f9aa959d9fd02770ee9c2c90ad5 (diff)
Merge branch '1.13'
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 9f8064fa..52fe4ff3 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :release:`1.13.1 <2014-05-07>`
+* :release:`1.12.4 <2014-05-07>`
+* :release:`1.11.6 <2014-05-07>`
* :bug:`-` `paramiko.file.BufferedFile.read` incorrectly returned text strings
after the Python 3 migration, despite bytes being more appropriate for file
contents (which may be binary or of an unknown encoding.) This has been