diff options
| author | Michael Merickel <michael@merickel.org> | 2014-05-07 01:47:05 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2014-05-07 01:47:05 -0500 |
| commit | 8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6 (patch) | |
| tree | a1ffe16937711d514433bce8e2112aea0a8321d5 /CONTRIBUTORS.txt | |
| parent | 8f22d846af8faba71a2e20e0fb9da52ec4ec5a5e (diff) | |
| parent | 93bc46364b13723194dba62fe78dee8b358d6401 (diff) | |
| download | pyramid-8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6.tar.gz pyramid-8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6.tar.bz2 pyramid-8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6.zip | |
Merge branch 'master' of https://github.com/ftravers/pyramid into pull.1325
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 d1ac72df5..c77d3e92c 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -230,3 +230,5 @@ Contributors - Antti Haapala, 2013/11/15 - Amit Mane, 2014/01/23 + +- Fenton Travers, 2014/05/06 |