diff options
| author | cguardia <carlos.delaguardia@gmail.com> | 2011-04-25 10:50:15 -0500 |
|---|---|---|
| committer | cguardia <carlos.delaguardia@gmail.com> | 2011-04-25 10:50:15 -0500 |
| commit | caff04f3732bf9423b41adc665af038e8627a7e5 (patch) | |
| tree | 31f8083ae8af207ce75b03384e46140b472989e2 /CONTRIBUTORS.txt | |
| parent | b61680ad87abcb524ae3fe846cd591c6ec1d54ef (diff) | |
| parent | bf6be9eae4d0be7789effd36875148b6319d77e1 (diff) | |
| download | pyramid-caff04f3732bf9423b41adc665af038e8627a7e5.tar.gz pyramid-caff04f3732bf9423b41adc665af038e8627a7e5.tar.bz2 pyramid-caff04f3732bf9423b41adc665af038e8627a7e5.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 5a72f242e..75f9e9166 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -135,3 +135,4 @@ Contributors - Juliusz Gonera, 2011/04/17 +- Philip Jenvey, 2011/04/24 |