summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2018-03-12 18:17:38 -0700
committerJeff Forcier <jeff@bitprophet.org>2018-03-12 18:17:38 -0700
commit6943aed6f969144748e6e3f396a8eff219defd64 (patch)
treefa09c9d4e83e27563fb8e55d2dc61fd2fb9c6979 /sites/www
parent8bd1506c816b025b4a74e1b254e4879518ae696d (diff)
parentff30839f40f9440925537d3de7f3e15beee3d265 (diff)
Merge branch '2.3' into 2.4
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 75dc7ca4..b6343c87 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -7,6 +7,8 @@ Changelog
* :release:`2.2.3 <2018-03-12>`
* :release:`2.1.5 <2018-03-12>`
* :release:`2.0.8 <2018-03-12>`
+* :release:`1.18.5 <2018-03-12>`
+* :release:`1.17.6 <2018-03-12>`
* :bug:`1175 (1.17+)` Fix a security flaw (CVE-2018-7750) in Paramiko's server
mode (emphasis on **server** mode; this does **not** impact *client* use!)
where authentication status was not checked before processing channel-open