summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-08-13 16:39:56 -0400
committerPaul Everitt <paul@agendaless.com>2013-08-13 16:39:56 -0400
commitfef73e0cb80ec71b7cccc96e1adcee6ffc26bce8 (patch)
tree51be51552313df4e197d841c94d84b5e1d7e8694 /CONTRIBUTORS.txt
parent0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6 (diff)
parenta54d7d6f33904e925da27e74d34039f56b7b68e1 (diff)
downloadpyramid-fef73e0cb80ec71b7cccc96e1adcee6ffc26bce8.tar.gz
pyramid-fef73e0cb80ec71b7cccc96e1adcee6ffc26bce8.tar.bz2
pyramid-fef73e0cb80ec71b7cccc96e1adcee6ffc26bce8.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 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