diff options
| author | Amos Latteier <amos@latteier.com> | 2016-06-30 10:17:43 -0700 |
|---|---|---|
| committer | Amos Latteier <amos@latteier.com> | 2016-06-30 10:17:43 -0700 |
| commit | 35209e4ac53520e1159bd8a6b47128f38a75db18 (patch) | |
| tree | 85b0f7e8e3794d8980dd10c10b7e57a862e694aa /CONTRIBUTORS.txt | |
| parent | 3fd41dcb5a94a73f43862f6d5c063af7b54e6ff3 (diff) | |
| parent | bcba92d1b23745d736bdcbc9b799929de382db7b (diff) | |
| download | pyramid-35209e4ac53520e1159bd8a6b47128f38a75db18.tar.gz pyramid-35209e4ac53520e1159bd8a6b47128f38a75db18.tar.bz2 pyramid-35209e4ac53520e1159bd8a6b47128f38a75db18.zip | |
Merge branch 'master' into exception_only
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 762793d0b..25ccf6838 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -270,3 +270,11 @@ Contributors - Vincent Férotin, 2016/05/08 - Berker Peksag, 2016/05/16 + +- Zack Brunson, 2016/06/02 + +- Marco Martinez, 2016/06/02 + +- Cris Ewing, 2016/06/03 + +- Jean-Christophe Bohin, 2016/06/13
\ No newline at end of file |