summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-05-04 18:27:40 -0700
committerChris McDonough <chrism@plope.com>2011-05-04 18:27:40 -0700
commitaf05419e53e432ef121e4e5e3d23b1d588dce0d8 (patch)
tree44a545651c01cf8d59c4cb5ed58972b648d0c94c /CONTRIBUTORS.txt
parent11c4d636ac158b7a3d0ca40cc52130ffef6d21c3 (diff)
parent127f51481cc47e9507bd4d87973a11e5dbab97c2 (diff)
downloadpyramid-af05419e53e432ef121e4e5e3d23b1d588dce0d8.tar.gz
pyramid-af05419e53e432ef121e4e5e3d23b1d588dce0d8.tar.bz2
pyramid-af05419e53e432ef121e4e5e3d23b1d588dce0d8.zip
Merge pull request #182 from cguardia/master
Merge paster pviews command from cguardia's master
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 75f9e9166..f2195de70 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -131,6 +131,8 @@ Contributors
- Malthe Borch, 2011/02/28
+- Carlos de la Guardia, 2011/03/29
+
- Joel Bohman, 2011/04/16
- Juliusz Gonera, 2011/04/17