summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorcewing <cris@crisewing.com>2016-10-22 12:35:21 -0400
committercewing <cris@crisewing.com>2016-10-22 12:35:21 -0400
commit03f6d630364a9adf438e0bd7d7b9f3bc3175f093 (patch)
treede2aed9476c9d569375287a4ea89e9faf0f7b73a /CONTRIBUTORS.txt
parent1610c8fd3605f2ed481c37da27a1ce059419888a (diff)
parente73ae375581539ed42aa97d7cd6e96e6fbd64c79 (diff)
downloadpyramid-03f6d630364a9adf438e0bd7d7b9f3bc3175f093.tar.gz
pyramid-03f6d630364a9adf438e0bd7d7b9f3bc3175f093.tar.bz2
pyramid-03f6d630364a9adf438e0bd7d7b9f3bc3175f093.zip
Merge branch 'master' into issue.2614
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 9f1ca0eae..bb21337e2 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -275,4 +275,12 @@ Contributors
- Marco Martinez, 2016/06/02
-- Cris Ewing, 2016/06/03 \ No newline at end of file
+- Cris Ewing, 2016/06/03
+
+- Jean-Christophe Bohin, 2016/06/13
+
+- Dariusz Gorecki, 2016/07/15
+
+- Jon Davidson, 2016/07/18
+
+- Keith Yang, 2016/07/22