summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-09-17 01:26:23 -0400
committerChris McDonough <chrism@plope.com>2012-09-17 01:26:23 -0400
commitcfa3f83e2b0c346b4f5b2537e20b2f0ef2c5f437 (patch)
tree334fdec94796b9c64a49f16dd89e4992ac1d589e /CONTRIBUTORS.txt
parent2389c332c63d0fedf5b65d45b0db55cb9c601818 (diff)
parent2d6a0e3a9d1699d033f45e52bac38589b1f7c054 (diff)
downloadpyramid-cfa3f83e2b0c346b4f5b2537e20b2f0ef2c5f437.tar.gz
pyramid-cfa3f83e2b0c346b4f5b2537e20b2f0ef2c5f437.tar.bz2
pyramid-cfa3f83e2b0c346b4f5b2537e20b2f0ef2c5f437.zip
Merge branch 'oddshocks-pretty-css' into 1.4-branch
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index e2a6ec018..d03da3e62 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,4 +1,4 @@
- Pylons Project Contributor Agreement
+Pylons Project Contributor Agreement
====================================
The submitter agrees by adding his or her name within the section below named
@@ -187,3 +187,4 @@ Contributors
- Domen Kozar, 2012/09/11
+- David Gay, 2012/09/16