diff options
| author | John Anderson <sontek@gmail.com> | 2015-01-01 22:02:17 -0800 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-01-01 22:02:17 -0800 |
| commit | 538fd5cc68a59dbaa577aa4c6ff89cc7c7fa421f (patch) | |
| tree | 5fe59ae987c429d8dea0babbde26ee91f41ff34f /CONTRIBUTORS.txt | |
| parent | 582c2ed180120d07c825e4897350f5d1a6285afa (diff) | |
| parent | 731a8e8380bbf9b41298c0417795e68899b91953 (diff) | |
| download | pyramid-538fd5cc68a59dbaa577aa4c6ff89cc7c7fa421f.tar.gz pyramid-538fd5cc68a59dbaa577aa4c6ff89cc7c7fa421f.tar.bz2 pyramid-538fd5cc68a59dbaa577aa4c6ff89cc7c7fa421f.zip | |
Merge branch 'master' of https://github.com/sontek/pyramid into support_more_features_in_routes
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 |