diff options
| author | Chris McDonough <chrism@plope.com> | 2012-04-17 04:59:48 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-04-17 04:59:48 -0400 |
| commit | c8aab32b60706f700b7f6a70d967727c353e3d54 (patch) | |
| tree | c7db8d4401e8a0dc8dc023679eb826d47b958f15 /CONTRIBUTORS.txt | |
| parent | 04e71690aaa32cb75af1095654d3f7e89946dab3 (diff) | |
| parent | 18410a6d9d64786f272268db6368981955ff9f10 (diff) | |
| download | pyramid-c8aab32b60706f700b7f6a70d967727c353e3d54.tar.gz pyramid-c8aab32b60706f700b7f6a70d967727c353e3d54.tar.bz2 pyramid-c8aab32b60706f700b7f6a70d967727c353e3d54.zip | |
Merge branch 'mmerickel-feature.json-api'
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 365e3e455..4b780d3a7 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -127,7 +127,7 @@ Contributors - Wichert Akkerman, 2011/01/19 -- Christopher Lambacehr, 2011/02/12 +- Christopher Lambacher, 2011/02/12 - Malthe Borch, 2011/02/28 |