diff options
| author | Chris McDonough <chrism@plope.com> | 2013-08-10 02:32:28 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-08-10 02:32:28 -0400 |
| commit | dff772959de5604c44a445bee30b9bdf9741f56b (patch) | |
| tree | 53c2a6a57e7d205e78aab7054684d312de6b4fb7 /HISTORY.txt | |
| parent | 3f503d0a30b487b590fc3e12834ce12d8ed0a25c (diff) | |
| parent | 3c173be3c43aba74554265cbfe3a11f4de9ca537 (diff) | |
| download | pyramid-dff772959de5604c44a445bee30b9bdf9741f56b.tar.gz pyramid-dff772959de5604c44a445bee30b9bdf9741f56b.tar.bz2 pyramid-dff772959de5604c44a445bee30b9bdf9741f56b.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 |