diff options
| author | John Anderson <sontek@gmail.com> | 2015-01-20 18:34:27 -0800 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-01-20 18:34:27 -0800 |
| commit | 8724ab8301c9d5808d781bab0af1df56909c9236 (patch) | |
| tree | 34fa963e424bae500e6bc010a7d2012c3d9bc89d /HISTORY.txt | |
| parent | ae7bcd7cabc53e0b500c6a79f30606e67217ad1d (diff) | |
| parent | 6c867a84ed7d7a1307811fba0cf1e1575b9dbefb (diff) | |
| download | pyramid-8724ab8301c9d5808d781bab0af1df56909c9236.tar.gz pyramid-8724ab8301c9d5808d781bab0af1df56909c9236.tar.bz2 pyramid-8724ab8301c9d5808d781bab0af1df56909c9236.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid into support_more_features_in_routes
Conflicts:
CHANGES.txt
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 |