diff options
| author | Chris McDonough <chrism@plope.com> | 2011-07-23 13:40:39 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-07-23 13:40:39 -0400 |
| commit | 566a276a37fad8073206b46ec77b27498a126f02 (patch) | |
| tree | 142acfcc9dd82f80949bbc04696725009155ed9a /CONTRIBUTORS.txt | |
| parent | 9a66aa09a8a773f67da59642a6642f1a3240c254 (diff) | |
| parent | b202997e2e0b9eed860afc9baa9497ba5b986fb1 (diff) | |
| download | pyramid-566a276a37fad8073206b46ec77b27498a126f02.tar.gz pyramid-566a276a37fad8073206b46ec77b27498a126f02.tar.bz2 pyramid-566a276a37fad8073206b46ec77b27498a126f02.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 cdc011f87..4e9d944ea 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -142,3 +142,5 @@ Contributors - Michael Merickel, 2011/5/25 - Christoph Zwerschke, 2011/06/07 + +- Shane Hathaway, 2011/07/22 |