diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-02-21 16:10:24 -0700 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-02-21 16:10:24 -0700 |
| commit | 1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad (patch) | |
| tree | 0db5dd6f25a9166c118c4a24d66f281f43b0aeba /CHANGES.txt | |
| parent | 30ae71b4a7ad97a649165374a75a70f4b64ae25c (diff) | |
| parent | aa6e5fe4f1190e6df123e3f6ccde9deb789eb344 (diff) | |
| download | pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.gz pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.bz2 pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.zip | |
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'CHANGES.txt')
| -rw-r--r-- | CHANGES.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 77f5d94ac..ffa5f51e0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,15 @@ +unreleased +========== + +- Dropped Python 3.2 support. + See https://github.com/Pylons/pyramid/pull/2256 + +- Fix ``pserve --browser`` to use the ``--server-name`` instead of the + app name when selecting a section to use. This was only working for people + who had server and app sections with the same name, for example + ``[app:main]`` and ``[server:main]``. + See https://github.com/Pylons/pyramid/pull/2292 + 1.6 (2015-04-14) ================ |