summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-10-01 16:54:04 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-10-01 16:54:04 -0700
commit417285fd7c40c6b756504e394d3cda1d56ff876d (patch)
tree7f6d9e534698fced7e578258c3636694744465b5 /sites/www
parenta2006766fb6afba93d57004ce1e5ed0ed71c4f16 (diff)
parentcf8921e310005832c82921ce67441cc82af18092 (diff)
Merge branch '1.13' into 1.14
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 b8110393..07b0a468 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :bug:`320` Update our win_pageant module to be Python 3 compatible. Thanks to
+``@sherbang`` and ``@adamkerz`` for the patches.
* :support:`378 backported` Minor code cleanup in the SSH config module
courtesy of Olle Lundberg.
* :support:`249` Consolidate version information into one spot. Thanks to Gabi