diff options
| author | Martin <martin.frlin@gmail.com> | 2016-12-06 12:07:38 +0100 |
|---|---|---|
| committer | Martin <martin.frlin@gmail.com> | 2016-12-06 12:07:38 +0100 |
| commit | 33a048d505f690bde6c44914dff154abfc2e790f (patch) | |
| tree | 52d0f892e5bd769b3942f860cb99bd03f3ec96ed /CONTRIBUTORS.txt | |
| parent | 8bb7a4ba3593895a12ded27260ece7c1d673de56 (diff) | |
| parent | fedfacf0bd1cbefbe922618d4df93917465f1307 (diff) | |
| download | pyramid-33a048d505f690bde6c44914dff154abfc2e790f.tar.gz pyramid-33a048d505f690bde6c44914dff154abfc2e790f.tar.bz2 pyramid-33a048d505f690bde6c44914dff154abfc2e790f.zip | |
Merge remote-tracking branch 'upstream/master' into issue-2656
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 98e243c1f..b4e30e085 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -286,3 +286,5 @@ Contributors - Keith Yang, 2016/07/22 - Moriyoshi Koizumi, 2016/11/20 + +- Mikko Ohtamaa, 2016/12/6 |