summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-07-25 14:27:54 -0700
committerJeff Forcier <jeff@bitprophet.org>2016-07-25 14:27:54 -0700
commit1e48f4bf4673ab9f917227f06e6ab9d049af87f0 (patch)
tree6bccd663dfa766f1873d54fe82f3a784da1a087d
parentc656dd97ebfa3f8ae926dac021ee5d88f323a565 (diff)
parent951eecebc5d6238c39d82df71b925855bdc19c56 (diff)
Merge branch '1.16' into 1.17
-rw-r--r--sites/www/changelog.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index ca682a9e..16f9ff06 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -224,10 +224,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