diff options
| author | Paul Everitt <paul@agendaless.com> | 2013-08-13 13:50:06 -0400 |
|---|---|---|
| committer | Paul Everitt <paul@agendaless.com> | 2013-08-13 13:50:06 -0400 |
| commit | 0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6 (patch) | |
| tree | 6d9f12bc42fde9fea95d7754f2decff212acf6ee /HISTORY.txt | |
| parent | d44d0e044555cd1287680fc8368632a64ebe979b (diff) | |
| parent | 5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff) | |
| download | pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.gz pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.bz2 pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.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 |