diff options
| author | Chris McDonough <chrism@plope.com> | 2010-11-09 15:15:33 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-11-09 15:15:33 -0500 |
| commit | 70ef2b24e98de336b1956a420ca91d85a6e98dd7 (patch) | |
| tree | a3de87a1270be5c4f229f8acfad3fb43fb9705aa | |
| parent | ccbc9539ca8f7a56089affb0bc1a6feb1f65272e (diff) | |
| parent | cb203d4cebe67e6ef45f2ba5f6f6d3d13bc8809a (diff) | |
| download | pyramid-70ef2b24e98de336b1956a420ca91d85a6e98dd7.tar.gz pyramid-70ef2b24e98de336b1956a420ca91d85a6e98dd7.tar.bz2 pyramid-70ef2b24e98de336b1956a420ca91d85a6e98dd7.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | CONTRIBUTORS.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 41ef4de23..43f6d1596 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -105,4 +105,6 @@ and agrees to the terms above in the section within this document entitled Contributors ------------ -Chris McDonough, 2010/11/08 +- Chris McDonough, 2010/11/08 + +- Tres Seaver, 2010/11/09 |