diff options
| author | Chris McDonough <chrism@plope.com> | 2012-07-29 10:01:40 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-07-29 10:01:40 -0400 |
| commit | d204b348535e4f28df4d59d25aa9b493306d41e5 (patch) | |
| tree | 8027ef04a07bd0c01f60d347d8fca2ec4d8acc7c /CONTRIBUTORS.txt | |
| parent | c7fcdf1665cfdc1173559baa0a56d9a06fcba448 (diff) | |
| parent | 14f9fe44ec75c055d89374a7852e1ca2af0ff31c (diff) | |
| download | pyramid-d204b348535e4f28df4d59d25aa9b493306d41e5.tar.gz pyramid-d204b348535e4f28df4d59d25aa9b493306d41e5.tar.bz2 pyramid-d204b348535e4f28df4d59d25aa9b493306d41e5.zip | |
Merge branch 'master' of 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 |