summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-09-14 16:09:42 -0400
committerChris McDonough <chrism@plope.com>2016-09-14 16:09:42 -0400
commit85bd2b8187c39e44285983261a74aa815f2b19ed (patch)
tree4bc2269119fbe03d1fa54171148ff0cc5d88fd93 /CONTRIBUTORS.txt
parentd350714a917b1a06dd4be6092e7b3da64771a4af (diff)
parent4acd85dc98fb2a43eae54d2116cc4bf383157269 (diff)
downloadpyramid-85bd2b8187c39e44285983261a74aa815f2b19ed.tar.gz
pyramid-85bd2b8187c39e44285983261a74aa815f2b19ed.tar.bz2
pyramid-85bd2b8187c39e44285983261a74aa815f2b19ed.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 25ccf6838..bb21337e2 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -277,4 +277,10 @@ Contributors
- Cris Ewing, 2016/06/03
-- Jean-Christophe Bohin, 2016/06/13 \ No newline at end of file
+- Jean-Christophe Bohin, 2016/06/13
+
+- Dariusz Gorecki, 2016/07/15
+
+- Jon Davidson, 2016/07/18
+
+- Keith Yang, 2016/07/22