summaryrefslogtreecommitdiffhomepage
path: root/sites/www/changelog.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-02-20 21:23:44 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-02-20 21:23:44 -0800
commit4b728fc3e4b99e8796d4b1cd182825efefbea639 (patch)
treefbddbf40248863c35d263e82f283ed04651b72c8 /sites/www/changelog.rst
parentdd66e4d50543ed44aac8868bd5c15187c9044275 (diff)
parent97c8becb3a192aae89d6eb5b4c92c8084420baed (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites/www/changelog.rst')
-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 1f7fa62c..49555ec9 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :release:`2.0.5 <2017-02-20>`
+* :release:`1.18.2 <2017-02-20>`
+* :release:`1.17.4 <2017-02-20>`
* :bug:`853 (1.17+)` Tweak how `RSAKey.__str__ <paramiko.rsakey.RSAKey>`
behaves so it doesn't cause ``TypeError`` under Python 3. Thanks to Francisco
Couzo for the report.