diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-10-01 16:54:24 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-10-01 16:54:24 -0700 |
| commit | cdd023ff66591b02982b88b37806cf80457c950c (patch) | |
| tree | c82c30370da97f8d76e29c27fdc0f8d7cedaf2a3 /sites | |
| parent | af9f16f9a03bede1c5af84d00bc73097f6b45b54 (diff) | |
| parent | 417285fd7c40c6b756504e394d3cda1d56ff876d (diff) | |
Merge branch '1.14' into 1.15
Conflicts:
sites/www/changelog.rst
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 3e654f69..b954a230 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 |