diff options
| author | Chris McDonough <chrism@plope.com> | 2013-08-15 18:40:27 +0200 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-08-15 18:40:27 +0200 |
| commit | 5aab1e9c2aebbbb0e955a34067db9a196d430a0c (patch) | |
| tree | 727028ad4eeb596c291d0f96fbc9bb520ec971fd /HISTORY.txt | |
| parent | b210ce350a3856166376f63a32725cc1516ba294 (diff) | |
| parent | 7319ab677216063581e47a231fd70b8b55a19466 (diff) | |
| download | pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.gz pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.bz2 pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.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 67de56998..bf054f9ed 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -2150,7 +2150,7 @@ Features - Add ``wild_domain`` argument to AuthTktAuthenticationPolicy, which defaults to ``True``. If it is set to ``False``, the feature of the policy which - sets a cookie with a wilcard domain will be turned off. + sets a cookie with a wildcard domain will be turned off. - Add a ``MANIFEST.in`` file to each paster template. See https://github.com/Pylons/pyramid/issues#issue/95 |