summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-04-18 02:12:43 -0400
committerChris McDonough <chrism@plope.com>2011-04-18 02:12:43 -0400
commit09049a49fa75c1813bb0842bb0a8b2073328dd89 (patch)
treef40bd8938ca8a98bd3b000bdacc72d9f365a71c3 /CONTRIBUTORS.txt
parent015296cc9c764f63c7b41427ec2538b5e0f861e0 (diff)
parent5ae903df461d7174f0a8bb590511607c8a054d98 (diff)
downloadpyramid-09049a49fa75c1813bb0842bb0a8b2073328dd89.tar.gz
pyramid-09049a49fa75c1813bb0842bb0a8b2073328dd89.tar.bz2
pyramid-09049a49fa75c1813bb0842bb0a8b2073328dd89.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 1ef785c3d..5a72f242e 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -131,3 +131,7 @@ Contributors
- Malthe Borch, 2011/02/28
+- Joel Bohman, 2011/04/16
+
+- Juliusz Gonera, 2011/04/17
+