diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-12-18 13:58:10 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-12-18 13:58:10 -0800 |
| commit | 6a3630dd638abafbb7befa52c59001a0d0ae49e9 (patch) | |
| tree | 66faeafb0d4182315beb7a672495125231d37dba /sites | |
| parent | b09d6c0612e8601fb39e4bdb1e6cc45f574ba6f6 (diff) | |
| parent | b3732cde6f2bea22fbbfd7ec6124489f61e502b7 (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, 1 insertions, 1 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index bf76d984..cd948812 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -38,7 +38,7 @@ Changelog packets encountered type errors. This is now fixed. Thanks to ``@mjmaenpaa`` for the catch. * :bug:`320` Update our win_pageant module to be Python 3 compatible. Thanks to -``@sherbang`` and ``@adamkerz`` for the patches. + ``@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 |