summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-08-13 15:08:57 -0500
committerMichael Merickel <michael@merickel.org>2013-08-13 15:08:57 -0500
commit8973ea4c1daf749022c4b103ab6e658557bae2fc (patch)
treef1dcb25af7024e3ff5d6d42a9daa8b31f060a6fe /CONTRIBUTORS.txt
parent5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff)
parent6a4a3413756a94f5e7ebbe7720788f28ca280a72 (diff)
downloadpyramid-8973ea4c1daf749022c4b103ab6e658557bae2fc.tar.gz
pyramid-8973ea4c1daf749022c4b103ab6e658557bae2fc.tar.bz2
pyramid-8973ea4c1daf749022c4b103ab6e658557bae2fc.zip
Merge branch 'fix-1040' of odontomachus/pyramid into 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