diff options
| author | Michael Merickel <michael@merickel.org> | 2015-02-11 12:32:26 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-02-11 12:32:35 -0600 |
| commit | 6e9e2dbb364f371b034b681dd44e6e6b831c5760 (patch) | |
| tree | b7d8c623706f5df330d9c72d4e1c9d84dd47b6cd /CONTRIBUTORS.txt | |
| parent | 14126cae5cf308ed466ed3eea576094e9c2193b4 (diff) | |
| parent | 1dc1f28e1184960f5359c6c510d23a0e6e9dafe8 (diff) | |
| download | pyramid-6e9e2dbb364f371b034b681dd44e6e6b831c5760.tar.gz pyramid-6e9e2dbb364f371b034b681dd44e6e6b831c5760.tar.bz2 pyramid-6e9e2dbb364f371b034b681dd44e6e6b831c5760.zip | |
Merge branch 'master' into feature.py3-coverage
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 66f029cb7..319d41434 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -234,3 +234,11 @@ Contributors - Fenton Travers, 2014/05/06 - Randall Leeds, 2014/11/11 + +- Hugo Branquinho, 2014/11/25 + +- Adrian Teng, 2014/12/17 + +- Ilja Everila, 2015/02/05 + +- Geoffrey T. Dairiki, 2015/02/06 |