summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-08-15 18:40:27 +0200
committerChris McDonough <chrism@plope.com>2013-08-15 18:40:27 +0200
commit5aab1e9c2aebbbb0e955a34067db9a196d430a0c (patch)
tree727028ad4eeb596c291d0f96fbc9bb520ec971fd /CONTRIBUTORS.txt
parentb210ce350a3856166376f63a32725cc1516ba294 (diff)
parent7319ab677216063581e47a231fd70b8b55a19466 (diff)
downloadpyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.gz
pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.bz2
pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt14
1 files changed, 14 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index d2b116f46..ef02bf7f4 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -202,3 +202,17 @@ Contributors
- Luke Cyca, 2013/05/30
- Laurence Rowe, 2013/04/24
+
+- Julian P. Glass, 2013/08/10
+
+- Junaid Ali, 2013/08/10
+
+- Chris Davies, 2013/08/11
+
+- Jonathan Villemaire-Krajden, 2013/08/13
+
+- Charlie Clark, 2013/08/15
+
+- Tom Lazar, 2013/08/15
+
+- Andreas Zeidler, 2013/08/15