diff options
| author | Chris McDonough <chrism@plope.com> | 2012-03-29 04:22:32 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-03-29 04:22:32 -0400 |
| commit | c24be2c07cad921c411d105a17a0d6cf9583b7df (patch) | |
| tree | 226eca892311341011e5cdcaf5e4861e65e9d6ae /CONTRIBUTORS.txt | |
| parent | 4321a443da2443e3097af254f285a50d81449b0f (diff) | |
| parent | de797c4cefb03f16cfe3505c85d94c0af24eb066 (diff) | |
| download | pyramid-c24be2c07cad921c411d105a17a0d6cf9583b7df.tar.gz pyramid-c24be2c07cad921c411d105a17a0d6cf9583b7df.tar.bz2 pyramid-c24be2c07cad921c411d105a17a0d6cf9583b7df.zip | |
Merge branch 'wwitzel3-json-api'
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 a402d49e6..c00170d09 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -166,3 +166,5 @@ Contributors - Paul M. Winkler, 2012/02/22 - Martijn Pieters, 2012/03/02 + +- Steve Piercy, 2012/03/27 |