summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-08-13 15:10:30 -0500
committerMichael Merickel <michael@merickel.org>2013-08-13 15:10:30 -0500
commit8784f61e17d4cea13ae4974d9ef26a530bd84e35 (patch)
treee5d6181cae3e00bbc26930ac573ebd6f9850ad05 /CONTRIBUTORS.txt
parent5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff)
parentb4ae4260ea434a39e5d3dfa026a7f6e70ef8d70c (diff)
downloadpyramid-8784f61e17d4cea13ae4974d9ef26a530bd84e35.tar.gz
pyramid-8784f61e17d4cea13ae4974d9ef26a530bd84e35.tar.bz2
pyramid-8784f61e17d4cea13ae4974d9ef26a530bd84e35.zip
Merge branch 'pull/1081'
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 0cecc93df..be9f36338 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -208,3 +208,5 @@ Contributors
- Junaid Ali, 2013/08/10
- Chris Davies, 2013/08/11
+
+- Jonathan Villemaire-Krajden, 2013/08/13