summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-09-18 12:11:01 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-09-18 12:11:01 -0700
commit601467f5b4d5927a8a672679b18da8ee58c13e2f (patch)
treedd5dbee997a1e9d1f02460913e5bf4fdc05c1e69 /sites
parentd6208bf892c380f439aa01679e95bafd6c380504 (diff)
parent7f2521da8f7dc2956f732e6f0c1251e136837d5e (diff)
Merge branch '2.1' into 2.2
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index b3609fe1..81621e69 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+* :release:`2.0.7 <2017-09-18>`
* :release:`1.18.4 <2017-09-18>`
* :bug:`1065` Add rekeying support to GSSAPI connections, which was erroneously
missing. Without this fix, any attempt to renegotiate the transport keys for