diff options
| author | Chris McDonough <chrism@plope.com> | 2015-02-17 18:57:31 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-02-17 18:57:31 -0500 |
| commit | 4dacb8c24efe98cb14b3ef89f6c9a8b2fd196790 (patch) | |
| tree | 039ca762ddcf6e4946a2570136927d2773374969 /HISTORY.txt | |
| parent | c5802723a4ea035076573838138878caf01735c1 (diff) | |
| parent | 75f85c57e0f4d1069cef9feb6ab6182b5f651492 (diff) | |
| download | pyramid-4dacb8c24efe98cb14b3ef89f6c9a8b2fd196790.tar.gz pyramid-4dacb8c24efe98cb14b3ef89f6c9a8b2fd196790.tar.bz2 pyramid-4dacb8c24efe98cb14b3ef89f6c9a8b2fd196790.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
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 |