diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2016-07-25 14:27:54 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2016-07-25 14:27:54 -0700 |
commit | 582e8642e06d1bcf6522b7ce8430dbca2e2eec51 (patch) | |
tree | 5d4d675bb56abc7d32201803febadada672d2291 /sites/www | |
parent | cb7a796bfea0c1c81f13d92e95963cc081aa69ee (diff) | |
parent | 1e48f4bf4673ab9f917227f06e6ab9d049af87f0 (diff) |
Merge branch '1.17' into 2.0
Diffstat (limited to 'sites/www')
-rw-r--r-- | sites/www/changelog.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index fc9532fb..efc97810 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -252,10 +252,10 @@ Changelog (:ref:`installation docs here <gssapi>`). Mega thanks to Sebastian Deiß, with assist by Torsten Landschoff. - .. note:: - Unix users should be aware that the ``python-gssapi`` library (a - requirement for using this functionality) only appears to support - Python 2.7 and up at this time. + .. note:: + Unix users should be aware that the ``python-gssapi`` library (a + requirement for using this functionality) only appears to support + Python 2.7 and up at this time. * :bug:`346 major` Fix an issue in private key files' encryption salts that could cause tracebacks and file corruption if keys were re-encrypted. Credit |