summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-10-01 16:54:27 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-10-01 16:54:27 -0700
commitd8674fba5250d18c85baa0aee860ddf7c1c0a459 (patch)
tree35d44401bd7cb1bb2d71b76df721db2a12526a99 /sites
parent1af8db2331ec9d5f729ff62d8af87b9d8c1c7fb8 (diff)
parentcdd023ff66591b02982b88b37806cf80457c950c (diff)
Merge branch '1.15'
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 374e04b3..156abb3f 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.
* :release:`1.15.1 <2014-09-22>`
* :bug:`399` SSH agent forwarding (potentially other functionality as
well) would hang due to incorrect values passed into the new window size