summaryrefslogtreecommitdiff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-09-21 18:28:51 -0700
committerGitHub <noreply@github.com>2018-09-21 18:28:51 -0700
commite79242f70982403197fed70a3079e876c47a604b (patch)
treed7aa2889b3611c11bce14cae7eafde9eaef51ed3 /CHANGES.rst
parentbff4d2b605c92fe2e6282861429ffc8e24c53796 (diff)
parentc8abfbba6414faeb85eb72b9d42825cbedc1ca48 (diff)
downloadpyramid-e79242f70982403197fed70a3079e876c47a604b.tar.gz
pyramid-e79242f70982403197fed70a3079e876c47a604b.tar.bz2
pyramid-e79242f70982403197fed70a3079e876c47a604b.zip
Merge pull request #3360 from stevepiercy/docs-add-rtd-ethical-ads-support
Add support for RTD Ethical Ads
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 63c9979f0..1530516f6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -114,6 +114,10 @@ Backward Incompatibilities
Documentation Changes
---------------------
+- Ad support for Read The Docs Ethical Ads.
+ https://github.com/Pylons/pyramid/pull/3360
+ https://docs.readthedocs.io/en/latest/advertising/ethical-advertising.html
+
- Add support for alembic to the pyramid-cookiecutter-alchemy cookiecutter
and update the wiki2 tutorial to explain how it works.
See https://github.com/Pylons/pyramid/pull/3307 and