diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2017-09-18 12:17:41 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2017-09-18 12:17:41 -0700 |
commit | c9b9677aaf8851f2782565c89bd79a2487a0292e (patch) | |
tree | df4f3da0c27acf2e653203a40208143cde375729 /sites | |
parent | 3ca6007daea7fb9f79ee41c67b245c554cc20131 (diff) | |
parent | 2deecdf886a91792e47164dd9e39634ba9c65735 (diff) |
Merge branch '2.2'
Diffstat (limited to 'sites')
-rw-r--r-- | sites/www/changelog.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 2e28c98c..da690000 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,8 @@ Changelog ========= +* :release:`2.2.2 <2017-09-18>` +* :release:`2.1.4 <2017-09-18>` * :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 |