diff options
| author | Michael Merickel <michael@merickel.org> | 2015-02-06 01:12:24 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-02-06 01:12:24 -0600 |
| commit | b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f (patch) | |
| tree | 695d4b5e5ae974d0770acfbe9b8231ea1c71288a /HISTORY.txt | |
| parent | d35a916095943b020f30acb90e878abe9bfd4fb1 (diff) | |
| parent | 4b13e0dfcdf47b3ef9befd529c0d78af8a2712d5 (diff) | |
| download | pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.tar.gz pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.tar.bz2 pyramid-b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f.zip | |
Merge branch 'master' into feature.re-entrant-config
Diffstat (limited to 'HISTORY.txt')
| -rw-r--r-- | HISTORY.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/HISTORY.txt b/HISTORY.txt index 6aad221a8..242568e98 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -1327,7 +1327,7 @@ Bug Fixes - Make test suite pass on 32-bit systems; closes #286. closes #306. See also https://github.com/Pylons/pyramid/issues/286 -- The ``pryamid.view.view_config`` decorator did not accept a ``match_params`` +- The ``pyramid.view.view_config`` decorator did not accept a ``match_params`` predicate argument. See https://github.com/Pylons/pyramid/pull/308 - The AuthTktCookieHelper could potentially generate Unicode headers |