diff options
| author | zrayn <zshooter@gmail.com> | 2016-06-02 16:43:23 -0700 |
|---|---|---|
| committer | zrayn <zshooter@gmail.com> | 2016-06-02 16:43:23 -0700 |
| commit | 3216188e967d8dd4d9770ee45d9750f109d15ff6 (patch) | |
| tree | 880ffc3184a98bae1631f1ee426e9d09c0054eab /CONTRIBUTORS.txt | |
| parent | a5cbfca0f0567db8c00fe401dcfb895ab9860710 (diff) | |
| parent | 281a670eefe741627a4523ed5acb74da9c5180b3 (diff) | |
| download | pyramid-3216188e967d8dd4d9770ee45d9750f109d15ff6.tar.gz pyramid-3216188e967d8dd4d9770ee45d9750f109d15ff6.tar.bz2 pyramid-3216188e967d8dd4d9770ee45d9750f109d15ff6.zip | |
Merge branch 'master' into stip_pserve_daemon_support
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 7b6473e97..16023c821 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -272,3 +272,5 @@ Contributors - Berker Peksag, 2016/05/16 - Zack Brunson, 2016/06/02 + +- Marco Martinez, 2016/06/02 |