summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-08-04 19:10:48 -0500
committerMichael Merickel <michael@merickel.org>2018-08-04 19:10:48 -0500
commit0ed6b99691f1392f9adbf61a9c0ffd7d8a46251f (patch)
tree2d20ad65049687dcc348b1e12b021fa80b5a7646
parent76c066c20f61fe99101e24c3781ed551e710e635 (diff)
downloadpyramid-0ed6b99691f1392f9adbf61a9c0ffd7d8a46251f.tar.gz
pyramid-0ed6b99691f1392f9adbf61a9c0ffd7d8a46251f.tar.bz2
pyramid-0ed6b99691f1392f9adbf61a9c0ffd7d8a46251f.zip
add changelog for #3307
-rw-r--r--CHANGES.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 47738e29b..1e412eab7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -91,6 +91,11 @@ Backward Incompatibilities
Documentation Changes
---------------------
+- 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
+ https://github.com/Pylons/pyramid-cookiecutter-alchemy/pull/7
+
- Bump Sphinx to >= 1.7.4 in setup.py to support ``emphasize-lines`` in PDFs
and to pave the way for xelatex support. See
https://github.com/Pylons/pyramid/pull/3271,