summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-02-20 17:02:09 -0600
committerMichael Merickel <michael@merickel.org>2015-02-20 17:02:09 -0600
commit2ce270cf141b90555d42ba2bf01b192b04e70dc3 (patch)
tree82bbb2b189b664170750a2441dbcc814aa5de57d /CONTRIBUTORS.txt
parent6e9e2dbb364f371b034b681dd44e6e6b831c5760 (diff)
parent1e02bbfc0df09259bf207112acf019c8dba44a90 (diff)
downloadpyramid-2ce270cf141b90555d42ba2bf01b192b04e70dc3.tar.gz
pyramid-2ce270cf141b90555d42ba2bf01b192b04e70dc3.tar.bz2
pyramid-2ce270cf141b90555d42ba2bf01b192b04e70dc3.zip
Merge branch 'master' into feature.py3-coverage
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 319d41434..4f9bd6e41 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -242,3 +242,5 @@ Contributors
- Ilja Everila, 2015/02/05
- Geoffrey T. Dairiki, 2015/02/06
+
+- David Glick, 2015/02/12