diff options
| author | John Anderson <sontek@gmail.com> | 2015-02-07 10:48:10 -0800 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-02-07 10:48:10 -0800 |
| commit | 50921e94c539318cb9e1789a2f9363352a820542 (patch) | |
| tree | 77430b23c95c50f79fb47e258528cec102de3e66 /HISTORY.txt | |
| parent | e094ab229eed6f8bf9e7a6a4d4406faefece41e4 (diff) | |
| parent | b17fa8b19da6e8272515588abbd2299f03bc2942 (diff) | |
| download | pyramid-50921e94c539318cb9e1789a2f9363352a820542.tar.gz pyramid-50921e94c539318cb9e1789a2f9363352a820542.tar.bz2 pyramid-50921e94c539318cb9e1789a2f9363352a820542.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid into catch_bad_request_method_name
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 |