summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-05-23 14:57:01 -0400
committerChris McDonough <chrism@plope.com>2014-05-23 14:57:01 -0400
commitd76bdb514c92ee1fd9b1bd67387d15d34ea28bb3 (patch)
tree36784e20002ecc4cb6675901b3cc2bda36e54caa /CONTRIBUTORS.txt
parent0c5bb0aa329239df877ccb053280e398766eb434 (diff)
parentc740e8bd20c049cbab43ce0a1cd5a4533fe6b849 (diff)
downloadpyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.tar.gz
pyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.tar.bz2
pyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 63528e662..c77d3e92c 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -228,3 +228,7 @@ Contributors
- Matthew Russell, 2013/10/14
- Antti Haapala, 2013/11/15
+
+- Amit Mane, 2014/01/23
+
+- Fenton Travers, 2014/05/06