summaryrefslogtreecommitdiff
path: root/HISTORY.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-04-02 13:57:30 -0400
committerChris McDonough <chrism@plope.com>2015-04-02 13:57:30 -0400
commit45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f (patch)
tree9efe59281dbc0b20b9a94b69ee0a18bcb124aa93 /HISTORY.txt
parentb6498fce8c1418f3c7b33d31aa9c151a86bc4166 (diff)
parent575ff8050b0cbdbf424947361f419b803568e122 (diff)
downloadpyramid-45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f.tar.gz
pyramid-45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f.tar.bz2
pyramid-45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'HISTORY.txt')
-rw-r--r--HISTORY.txt2
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