diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-07 01:37:43 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-07 01:37:43 -0400 |
| commit | e5374481eee64974d083ea74a293e999bf8c4205 (patch) | |
| tree | 2bfbe7e944decfc889e043e520bc98ecd0e590b9 /CONTRIBUTORS.txt | |
| parent | 90b9686a20e6465b9a97ce02e4d10080c0cf271e (diff) | |
| parent | 60945d27ec06ca5c1855e7d8341d010f51153e60 (diff) | |
| download | pyramid-e5374481eee64974d083ea74a293e999bf8c4205.tar.gz pyramid-e5374481eee64974d083ea74a293e999bf8c4205.tar.bz2 pyramid-e5374481eee64974d083ea74a293e999bf8c4205.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 0ddaebf15..1a5b975d7 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -220,3 +220,5 @@ Contributors - Matthew Wilkes, 2013/08/23 - Takahiro Fujiwara, 2013/08/28 + +- Doug Hellmann, 2013/09/06 |