diff options
| author | Michael Merickel <michael@merickel.org> | 2016-12-10 00:01:05 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-12-10 00:01:05 -0600 |
| commit | 1fde5f47b8b6208a25e951c6d3887cc73cc3696e (patch) | |
| tree | 1975f4d89d0422aaabd09b9bf94ac0da93534f8d /CONTRIBUTORS.txt | |
| parent | ff0da73a8922b5e82c676715078c7b9e60a6a1da (diff) | |
| parent | 2d45def603f038a8533eb9790640982012c0be30 (diff) | |
| download | pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.tar.gz pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.tar.bz2 pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.zip | |
Merge branch 'master' into pserve-watch-files
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 |