diff options
| author | Michael Merickel <michael@merickel.org> | 2018-09-27 01:24:33 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-09-27 01:24:33 -0500 |
| commit | f4404b11a89f9d32652702190506984a594d8393 (patch) | |
| tree | 67a7b7b22726d89be68383d27da80c3ef4a72cb2 /CHANGES.rst | |
| parent | 97ee7f3aa8af74a01e51c0c14fda1c0a5a490663 (diff) | |
| parent | 4eade6a2fa6111673231b02344afdc562fe7f05d (diff) | |
| download | pyramid-f4404b11a89f9d32652702190506984a594d8393.tar.gz pyramid-f4404b11a89f9d32652702190506984a594d8393.tar.bz2 pyramid-f4404b11a89f9d32652702190506984a594d8393.zip | |
Merge branch 'master' into deprecate-pickle-sessions
Diffstat (limited to 'CHANGES.rst')
| -rw-r--r-- | CHANGES.rst | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 54b8beba4..926584de0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -62,6 +62,10 @@ Features information about this feature. See https://github.com/Pylons/pyramid/pull/3353 +- Add a ``registry`` argument to ``pyramid.renderers.get_renderer`` + to allow users to avoid threadlocals during renderer lookup. + See https://github.com/Pylons/pyramid/pull/3358 + Bug Fixes --------- @@ -130,6 +134,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 |