diff options
| author | Chris McDonough <chrism@plope.com> | 2013-11-16 05:03:24 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-11-16 05:03:24 -0500 |
| commit | ed05dec62b16688b02a4c5c3eefd208090d7e267 (patch) | |
| tree | 4b3321224aa815941606c4eddad32bb972fdc087 /CONTRIBUTORS.txt | |
| parent | 4aafb2bc4289ff4a113e547bea8ba301756e965e (diff) | |
| parent | 66944f419f0a287d89c502a1140358b2c5f81ff5 (diff) | |
| download | pyramid-ed05dec62b16688b02a4c5c3eefd208090d7e267.tar.gz pyramid-ed05dec62b16688b02a4c5c3eefd208090d7e267.tar.bz2 pyramid-ed05dec62b16688b02a4c5c3eefd208090d7e267.zip | |
Merge branch 'master' of github.com:ztane/pyramid into ztane-master
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 6dba1076e..63528e662 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -226,3 +226,5 @@ Contributors - Karl O. Pinc, 2013/09/27 - Matthew Russell, 2013/10/14 + +- Antti Haapala, 2013/11/15 |