diff options
| author | Michael Merickel <michael@merickel.org> | 2012-08-23 10:43:32 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2012-08-23 10:43:32 -0500 |
| commit | 04373f1691c2e17a28a62b9ed30fcc830a007ffd (patch) | |
| tree | a180a73213cd8cd1eeb63e05297f7ff92986009b /CONTRIBUTORS.txt | |
| parent | 45b6e192c44ebee124317a90a9a6dcc044407a2a (diff) | |
| parent | ce5b5e4b842fe0e88d9ba5055b419b756723e8ec (diff) | |
| download | pyramid-04373f1691c2e17a28a62b9ed30fcc830a007ffd.tar.gz pyramid-04373f1691c2e17a28a62b9ed30fcc830a007ffd.tar.bz2 pyramid-04373f1691c2e17a28a62b9ed30fcc830a007ffd.zip | |
Merge branch 'accept_header' of lmctv/pyramid into pull.620
Conflicts:
CONTRIBUTORS.txt
pyramid/config/views.py
Updated the pull request to fix incompatibilities from changes
to Pyramid's predicate machinery.
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index e44117af3..264acf048 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -173,6 +173,8 @@ Contributors - Marin Rukavina, 2012/05/03 +- Lorenzo M. Catucci, 2012/06/08 + - Marc Abramowitz, 2012/06/13 - Jeff Cook, 2012/06/16 |