summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-07-01 01:41:42 +0200
committerChris McDonough <chrism@plope.com>2016-07-01 01:41:42 +0200
commitd350714a917b1a06dd4be6092e7b3da64771a4af (patch)
tree80c26cdd036093d312c2017c85eb05f94f19692c /CONTRIBUTORS.txt
parent88d40ca6a84920d4c36b7a3be1cf3b46a6375f4e (diff)
parentbcba92d1b23745d736bdcbc9b799929de382db7b (diff)
downloadpyramid-d350714a917b1a06dd4be6092e7b3da64771a4af.tar.gz
pyramid-d350714a917b1a06dd4be6092e7b3da64771a4af.tar.bz2
pyramid-d350714a917b1a06dd4be6092e7b3da64771a4af.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 16023c821..25ccf6838 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -274,3 +274,7 @@ Contributors
- Zack Brunson, 2016/06/02
- Marco Martinez, 2016/06/02
+
+- Cris Ewing, 2016/06/03
+
+- Jean-Christophe Bohin, 2016/06/13 \ No newline at end of file