diff options
| author | Ian Joseph Wilson <ianjosephwilson@gmail.com> | 2012-06-17 10:34:48 -0700 |
|---|---|---|
| committer | Ian Joseph Wilson <ianjosephwilson@gmail.com> | 2012-06-17 10:34:48 -0700 |
| commit | 2e1d2009f3abe8163e9e2adc5ff5c0bbeb1b4630 (patch) | |
| tree | 48244d0278a25f145e9d5e0f00703836a0492059 /CONTRIBUTORS.txt | |
| parent | cf46a12292cf15303d68d27c6ba4155ecc2b4586 (diff) | |
| parent | 3da92290bfaa8b4072019c916e75cd96ebc0f6dc (diff) | |
| download | pyramid-2e1d2009f3abe8163e9e2adc5ff5c0bbeb1b4630.tar.gz pyramid-2e1d2009f3abe8163e9e2adc5ff5c0bbeb1b4630.tar.bz2 pyramid-2e1d2009f3abe8163e9e2adc5ff5c0bbeb1b4630.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 98f73d5f9..c3995aaba 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -172,3 +172,7 @@ Contributors - Wayne Witzel III, 2012/03/27 - Marin Rukavina, 2012/05/03 + +- Marc Abramowitz, 2012/06/13 + +- Jeff Cook, 2012/06/16 |