summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-04-25 13:39:37 -0400
committerChris McDonough <chrism@plope.com>2011-04-25 13:39:37 -0400
commit7e655f50decd44ae9118700e5d00d668bab6788c (patch)
tree3499c553e5651f018771fe96e3e7b73be65f3508 /CONTRIBUTORS.txt
parentf4f1667e992fb6b3e8f6185bfe62f4d37aeaf687 (diff)
parentbf6be9eae4d0be7789effd36875148b6319d77e1 (diff)
downloadpyramid-7e655f50decd44ae9118700e5d00d668bab6788c.tar.gz
pyramid-7e655f50decd44ae9118700e5d00d668bab6788c.tar.bz2
pyramid-7e655f50decd44ae9118700e5d00d668bab6788c.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt1
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