diff options
| author | Chris McDonough <chrism@plope.com> | 2016-06-02 21:17:59 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2016-06-02 21:17:59 -0400 |
| commit | 88d40ca6a84920d4c36b7a3be1cf3b46a6375f4e (patch) | |
| tree | 187d1e54a5c0054b3670ab4b11dd09893cd5474f /CONTRIBUTORS.txt | |
| parent | 3e9a737500e79a6a919ce53db9557c75d874b84c (diff) | |
| parent | 03301637f1069a084e539b04944eb45eec59628e (diff) | |
| download | pyramid-88d40ca6a84920d4c36b7a3be1cf3b46a6375f4e.tar.gz pyramid-88d40ca6a84920d4c36b7a3be1cf3b46a6375f4e.tar.bz2 pyramid-88d40ca6a84920d4c36b7a3be1cf3b46a6375f4e.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 762793d0b..16023c821 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -270,3 +270,7 @@ Contributors - Vincent Férotin, 2016/05/08 - Berker Peksag, 2016/05/16 + +- Zack Brunson, 2016/06/02 + +- Marco Martinez, 2016/06/02 |