summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-08-23 11:12:01 -0400
committerChris McDonough <chrism@plope.com>2013-08-23 11:12:01 -0400
commit2607548beba0082cf6256bf556d65e08cec9ee57 (patch)
tree312a76ee2c11d6d218a11c3acf8bf77d5df0b326 /CONTRIBUTORS.txt
parent2d039b9333f99cfe19fed82f441aebde6c4c9be3 (diff)
parent94b817ae54317652b784fbc9e3a90b7215ed00f5 (diff)
downloadpyramid-2607548beba0082cf6256bf556d65e08cec9ee57.tar.gz
pyramid-2607548beba0082cf6256bf556d65e08cec9ee57.tar.bz2
pyramid-2607548beba0082cf6256bf556d65e08cec9ee57.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 ef02bf7f4..591dcd7e4 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -216,3 +216,5 @@ Contributors
- Tom Lazar, 2013/08/15
- Andreas Zeidler, 2013/08/15
+
+- Matthew Wilkes, 2013/08/23