diff options
| author | John Anderson <sontek@gmail.com> | 2015-01-05 23:46:28 -0800 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-01-05 23:46:28 -0800 |
| commit | ae7bcd7cabc53e0b500c6a79f30606e67217ad1d (patch) | |
| tree | 7c33b2a6244d03df275f4cce83f4f3f1f77c94bf /CHANGES.txt | |
| parent | 83a400a3cd121fe65d33e796c28a199b35ab67e5 (diff) | |
| parent | 2d659e41d01926acaa8670c4d20be20300bcedb7 (diff) | |
| download | pyramid-ae7bcd7cabc53e0b500c6a79f30606e67217ad1d.tar.gz pyramid-ae7bcd7cabc53e0b500c6a79f30606e67217ad1d.tar.bz2 pyramid-ae7bcd7cabc53e0b500c6a79f30606e67217ad1d.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid into support_more_features_in_routes
Conflicts:
CHANGES.txt
Diffstat (limited to 'CHANGES.txt')
| -rw-r--r-- | CHANGES.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 2079d5cff..0381c1820 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -64,6 +64,10 @@ Features a factory that will return a custom ``Response`` class. See https://github.com/Pylons/pyramid/pull/1499 +- Allow an iterator to be returned from a renderer. Previously it was only + possible to return bytes or unicode. + See https://github.com/Pylons/pyramid/pull/1417 + - Overall improvments for the ``proutes`` command. Added ``--format`` and ``--glob`` arguments to the command, introduced the ``method`` column for displaying available request methods, and improved the ``view`` |