Skip to content

Commit

Permalink
Merge branch '1.13' into 1.14
Browse files Browse the repository at this point in the history
  • Loading branch information
bitprophet committed Dec 18, 2014
2 parents e088252 + ec5a866 commit b3732cd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sites/www/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b3732cd

Please sign in to comment.