diff options
| author | Chris McDonough <chrism@plope.com> | 2014-12-16 19:49:03 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-12-16 19:49:03 -0500 |
| commit | 01d67c0b147d0b8e068c94d4db72bcf477b0049c (patch) | |
| tree | 4ea4dcddda9efc17294e007d084c3dca88aec442 /CONTRIBUTORS.txt | |
| parent | 27db38880d46b6f4345cf86766924de976e24177 (diff) | |
| parent | 2711913daac645dc1960074d6c5121c8fb49b772 (diff) | |
| download | pyramid-01d67c0b147d0b8e068c94d4db72bcf477b0049c.tar.gz pyramid-01d67c0b147d0b8e068c94d4db72bcf477b0049c.tar.bz2 pyramid-01d67c0b147d0b8e068c94d4db72bcf477b0049c.zip | |
Merge branch 'master' of https://github.com/AdrianTeng/pyramid into AdrianTeng-master
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 9c2191f3b..e4132cda5 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -236,3 +236,5 @@ Contributors - Randall Leeds, 2014/11/11 - Hugo Branquinho, 2014/11/25 + +- Adrian Teng, 2014/12/17 |