summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-10-05 02:33:18 -0700
committerGitHub <noreply@github.com>2018-10-05 02:33:18 -0700
commit086198b5db7dcb86c2b4edbc5d3610dcade0332a (patch)
tree1af84e37e9ad7bdb445786a0345822dcdfd851f0 /CONTRIBUTORS.txt
parent2fa1e218ea6b9a6d5c3f8193ea27d0fc44b8964a (diff)
parentf6becd23966248fb7fc4db218258be4364902f8f (diff)
downloadpyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.gz
pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.bz2
pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.zip
Merge branch 'master' into one_cc
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 0c18d600f..80b43c8ec 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -331,3 +331,4 @@ Contributors
- Kuzma Leshakov, 2018/09/07
+- Colin Dunklau, 2018/09/19