summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-06-05 14:06:02 -0400
committerChris McDonough <chrism@plope.com>2015-06-05 14:06:02 -0400
commitf3c67a4217504bc7f2862ec1616342240738efae (patch)
tree9e7452b3ffdc8d4f30739cfc9d898169d6719206 /CONTRIBUTORS.txt
parent7b4ed3088af03de473ad164c314062c283afce39 (diff)
parentc1dbb5092d486df5d7fbad8e52cd1dbcc2c834d9 (diff)
downloadpyramid-f3c67a4217504bc7f2862ec1616342240738efae.tar.gz
pyramid-f3c67a4217504bc7f2862ec1616342240738efae.tar.bz2
pyramid-f3c67a4217504bc7f2862ec1616342240738efae.zip
Merge branch 'master' of github.com:Pylons/pyramid
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 3d574f99d..8eadbeecf 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -246,3 +246,5 @@ Contributors
- David Glick, 2015/02/12
- Donald Stufft, 2015/03/15
+
+- Karen Dalton, 2015/06/01