diff options
| author | Michael Merickel <michael@merickel.org> | 2015-02-11 12:32:26 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-02-11 12:32:35 -0600 |
| commit | 6e9e2dbb364f371b034b681dd44e6e6b831c5760 (patch) | |
| tree | b7d8c623706f5df330d9c72d4e1c9d84dd47b6cd /HISTORY.txt | |
| parent | 14126cae5cf308ed466ed3eea576094e9c2193b4 (diff) | |
| parent | 1dc1f28e1184960f5359c6c510d23a0e6e9dafe8 (diff) | |
| download | pyramid-6e9e2dbb364f371b034b681dd44e6e6b831c5760.tar.gz pyramid-6e9e2dbb364f371b034b681dd44e6e6b831c5760.tar.bz2 pyramid-6e9e2dbb364f371b034b681dd44e6e6b831c5760.zip | |
Merge branch 'master' into feature.py3-coverage
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 |