summaryrefslogtreecommitdiff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorTheron Luhn <theron@luhn.com>2019-03-30 15:02:43 -0700
committerTheron Luhn <theron@luhn.com>2019-03-30 15:02:43 -0700
commitb05b66e77b9851ff2ed912b6b8bfa0d5068febd1 (patch)
treed2cb66fc602f430522c6459923e88a303086f513 /CHANGES.rst
parent9f267dd842c5e93336f0392f2809da75a716039a (diff)
parent01618a1399f547fb1f89cf8b56600325b4f8d04b (diff)
downloadpyramid-b05b66e77b9851ff2ed912b6b8bfa0d5068febd1.tar.gz
pyramid-b05b66e77b9851ff2ed912b6b8bfa0d5068febd1.tar.bz2
pyramid-b05b66e77b9851ff2ed912b6b8bfa0d5068febd1.zip
Merge branch 'master' into security-policy
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index d8a4f45a6..afac078b0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -93,3 +93,6 @@ Documentation Changes
- Restore build of PDF on Read The Docs.
See https://github.com/Pylons/pyramid/issues/3290
+
+- Fix docs build for Sphinx 2.0.
+ See https://github.com/Pylons/pyramid/pull/3480