diff options
| author | Chris McDonough <chrism@plope.com> | 2014-01-28 14:30:28 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-01-28 14:30:28 -0500 |
| commit | ea8961e64a7ae2c384883fe4ae4812edf290afc2 (patch) | |
| tree | 2c3af390109acffc5954b87a1f31178e63b9e6a4 /CONTRIBUTORS.txt | |
| parent | f58977a38ac65dce742dac38fe1179f61bfc3efc (diff) | |
| parent | 78d202a1c7537c135de8c377d63317f823fb8e22 (diff) | |
| download | pyramid-ea8961e64a7ae2c384883fe4ae4812edf290afc2.tar.gz pyramid-ea8961e64a7ae2c384883fe4ae4812edf290afc2.tar.bz2 pyramid-ea8961e64a7ae2c384883fe4ae4812edf290afc2.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
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 63528e662..d1ac72df5 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -228,3 +228,5 @@ Contributors - Matthew Russell, 2013/10/14 - Antti Haapala, 2013/11/15 + +- Amit Mane, 2014/01/23 |