summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-12-05 20:06:58 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-12-05 20:06:58 -0800
commitc13f7b3c59da66856ffffad7e2af0a3ff91222f1 (patch)
treee662f8f3b210bb65ce3c878cce469d4e16f99b9a /sites
parent5cad7e4df9bf53528c28c86d6dd945133ee2028e (diff)
parent1d3ce6de95ac602a1a27d9a09b5de557bee07abf (diff)
Merge branch '1.18' into 2.0
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 260c6856..51238f32 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :support:`792 (1.17+)` Minor updates to the README and demos; thanks to Alan
+ Yee.
* :feature:`780 (1.18+)` (also :issue:`779`, and may help users affected by
:issue:`520`) Add an optional ``timeout`` parameter to
`Transport.start_client <paramiko.transport.Transport.start_client>` (and