diff options
| author | Chris McDonough <chrism@plope.com> | 2013-10-01 10:49:37 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-10-01 10:49:37 -0400 |
| commit | 5f3405096173450e43152c2d7172cca97512ac4e (patch) | |
| tree | 0f6b27ad2f0244d488454c572b869a3501d2acda /CONTRIBUTORS.txt | |
| parent | d65b1597ddbdfb161a0c83c46b5ebad878571c76 (diff) | |
| parent | 1a76ed41b133ea73c7d40997c6f564fd72d7273e (diff) | |
| download | pyramid-5f3405096173450e43152c2d7172cca97512ac4e.tar.gz pyramid-5f3405096173450e43152c2d7172cca97512ac4e.tar.bz2 pyramid-5f3405096173450e43152c2d7172cca97512ac4e.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 1a5b975d7..bfe22e540 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -222,3 +222,5 @@ Contributors - Takahiro Fujiwara, 2013/08/28 - Doug Hellmann, 2013/09/06 + +- Karl O. Pinc, 2013/09/27 |