diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-09 14:14:35 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-09 14:14:35 -0400 |
| commit | 7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce (patch) | |
| tree | 227c5b5e5a0b1ee8d8974679b58f29a162b8b2af /CONTRIBUTORS.txt | |
| parent | 7a73e56d4d86d9139fd54a9cd83a68d25bc02df7 (diff) | |
| parent | 26787cf215b9bb6ddc0cce84a777f7c2e3079842 (diff) | |
| download | pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.tar.gz pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.tar.bz2 pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.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 |