summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-10-08 17:34:43 -0400
committerChris McDonough <chrism@plope.com>2012-10-08 17:34:43 -0400
commit2aed2c783a99efaa48b145d174347c9512e40c5a (patch)
tree11ab8f12072353e7e324e66bda5914c78cd5c1ea /CONTRIBUTORS.txt
parenta9f5e705bb331098946eef774857511a02e4f498 (diff)
parent1273d56ee5c038f447dce0525844cd3ea6c15e4d (diff)
downloadpyramid-2aed2c783a99efaa48b145d174347c9512e40c5a.tar.gz
pyramid-2aed2c783a99efaa48b145d174347c9512e40c5a.tar.bz2
pyramid-2aed2c783a99efaa48b145d174347c9512e40c5a.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 264acf048..d03da3e62 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,4 +1,4 @@
- Pylons Project Contributor Agreement
+Pylons Project Contributor Agreement
====================================
The submitter agrees by adding his or her name within the section below named
@@ -177,8 +177,14 @@ Contributors
- Marc Abramowitz, 2012/06/13
+- Brian Sutherland, 2012/06/16
+
- Jeff Cook, 2012/06/16
- Ian Wilson, 2012/06/17
- Roman Kozlovskyi, 2012/08/11
+
+- Domen Kozar, 2012/09/11
+
+- David Gay, 2012/09/16