diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-12-18 13:57:37 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-12-18 13:57:37 -0800 |
| commit | b3732cde6f2bea22fbbfd7ec6124489f61e502b7 (patch) | |
| tree | 8e125006cd0395992aff94b7e3617b9b79611393 | |
| parent | e088252f4d3e3946850787fd854f4a790cb9a8c3 (diff) | |
| parent | ec5a86619c5527f119a687ec00e8811657dd1f51 (diff) | |
Merge branch '1.13' into 1.14
| -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 150cd491..a1d640af 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -24,7 +24,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. * :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 |