summaryrefslogtreecommitdiffhomepage
path: root/sites/www/changelog.rst
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
commit951eecebc5d6238c39d82df71b925855bdc19c56 (patch)
treeff844a904bcb468d8075a17a006f30a1e63f8c62 /sites/www/changelog.rst
parent5fd79fc5f4fee37975c1de0e2f4fbed835145b09 (diff)
parent3ba56f663fb42e1233fef7a8110cf6a1a87df583 (diff)
Merge branch '1.15' into 1.16
Diffstat (limited to 'sites/www/changelog.rst')
-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 589e9f8a..a7cdeffd 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -216,10 +216,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