diff options
| author | Chris McDonough <chrism@plope.com> | 2014-05-12 19:17:02 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-05-12 19:17:02 -0400 |
| commit | a978083b5719faf13e2ccf98ae93d5b03ec0d7cb (patch) | |
| tree | a1ffe16937711d514433bce8e2112aea0a8321d5 /CONTRIBUTORS.txt | |
| parent | 50d2b85e5e2795c2b129a86e8d388909fbc2835f (diff) | |
| parent | 8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6 (diff) | |
| download | pyramid-a978083b5719faf13e2ccf98ae93d5b03ec0d7cb.tar.gz pyramid-a978083b5719faf13e2ccf98ae93d5b03ec0d7cb.tar.bz2 pyramid-a978083b5719faf13e2ccf98ae93d5b03ec0d7cb.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 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 |