diff options
| author | Paul Everitt <paul@agendaless.com> | 2013-08-13 16:42:16 -0400 |
|---|---|---|
| committer | Paul Everitt <paul@agendaless.com> | 2013-08-13 16:42:16 -0400 |
| commit | 6a227f73e7dedb0bc551242a44a86bf03f4e6f42 (patch) | |
| tree | 37b965b652a53bd114cd9be631f2dd668ec6ae32 /CONTRIBUTORS.txt | |
| parent | 86553245537393611da769b3fcc29a23e9ef68b0 (diff) | |
| parent | fef73e0cb80ec71b7cccc96e1adcee6ffc26bce8 (diff) | |
| download | pyramid-6a227f73e7dedb0bc551242a44a86bf03f4e6f42.tar.gz pyramid-6a227f73e7dedb0bc551242a44a86bf03f4e6f42.tar.bz2 pyramid-6a227f73e7dedb0bc551242a44a86bf03f4e6f42.zip | |
Merge branch 'master' into docs.gettingstarted
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
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 |