summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-09-18 12:10:58 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-09-18 12:10:58 -0700
commit7f2521da8f7dc2956f732e6f0c1251e136837d5e (patch)
treed4838fc852585f3f2e231c54796cd7477358b937 /sites
parentb58beb4dd0211092e352fd01af0be5e6550c9db5 (diff)
parent0e1cd71a75e0ffca549285fab9acd6f169254ffe (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 0ed3e587..0f02c3d5 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+* :release:`2.0.7 <2017-09-18>`
* :release:`1.18.4 <2017-09-18>`
* :bug:`1061` Clean up GSSAPI authentication procedures so they do not prevent
normal fallback to other authentication methods on failure. (In other words,