diff options
| author | John Anderson <sontek@gmail.com> | 2015-02-07 10:48:10 -0800 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-02-07 10:48:10 -0800 |
| commit | 50921e94c539318cb9e1789a2f9363352a820542 (patch) | |
| tree | 77430b23c95c50f79fb47e258528cec102de3e66 /CONTRIBUTORS.txt | |
| parent | e094ab229eed6f8bf9e7a6a4d4406faefece41e4 (diff) | |
| parent | b17fa8b19da6e8272515588abbd2299f03bc2942 (diff) | |
| download | pyramid-50921e94c539318cb9e1789a2f9363352a820542.tar.gz pyramid-50921e94c539318cb9e1789a2f9363352a820542.tar.bz2 pyramid-50921e94c539318cb9e1789a2f9363352a820542.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid into catch_bad_request_method_name
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 e4132cda5..319d41434 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -238,3 +238,7 @@ Contributors - Hugo Branquinho, 2014/11/25 - Adrian Teng, 2014/12/17 + +- Ilja Everila, 2015/02/05 + +- Geoffrey T. Dairiki, 2015/02/06 |