diff options
| author | Chris McDonough <chrism@plope.com> | 2011-05-04 21:28:52 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-05-04 21:28:52 -0400 |
| commit | 70a11094ab4d92d7d6a5800b4437f79af2562866 (patch) | |
| tree | 44a545651c01cf8d59c4cb5ed58972b648d0c94c /CONTRIBUTORS.txt | |
| parent | f426e51a98a85ab55545bd836f31d8731cc14cfe (diff) | |
| parent | af05419e53e432ef121e4e5e3d23b1d588dce0d8 (diff) | |
| download | pyramid-70a11094ab4d92d7d6a5800b4437f79af2562866.tar.gz pyramid-70a11094ab4d92d7d6a5800b4437f79af2562866.tar.bz2 pyramid-70a11094ab4d92d7d6a5800b4437f79af2562866.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
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 75f9e9166..f2195de70 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -131,6 +131,8 @@ Contributors - Malthe Borch, 2011/02/28 +- Carlos de la Guardia, 2011/03/29 + - Joel Bohman, 2011/04/16 - Juliusz Gonera, 2011/04/17 |