diff options
| author | Chris McDonough <chrism@plope.com> | 2014-12-16 19:54:24 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-12-16 19:54:24 -0500 |
| commit | c5802723a4ea035076573838138878caf01735c1 (patch) | |
| tree | dfe6668ed5b4af60e88901aadb41a92e46b6c867 /CONTRIBUTORS.txt | |
| parent | 27db38880d46b6f4345cf86766924de976e24177 (diff) | |
| parent | 2660f5053de5383aacf4ceff3d4e05d7e73f1635 (diff) | |
| download | pyramid-c5802723a4ea035076573838138878caf01735c1.tar.gz pyramid-c5802723a4ea035076573838138878caf01735c1.tar.bz2 pyramid-c5802723a4ea035076573838138878caf01735c1.zip | |
Merge branch '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 |