diff options
| author | Michael Merickel <michael@merickel.org> | 2015-03-05 10:09:53 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-03-05 10:09:53 -0600 |
| commit | 6279cc428b2464066f67e4795045680bb3d59973 (patch) | |
| tree | 5f8e22498468f316d88b326baa751abf0acb1d9d /CONTRIBUTORS.txt | |
| parent | 06bb4a4db67321e7629f4f2438516ba358f226e9 (diff) | |
| parent | af810c54fa9829096085f0ca601030c4fb74b5c7 (diff) | |
| download | pyramid-6279cc428b2464066f67e4795045680bb3d59973.tar.gz pyramid-6279cc428b2464066f67e4795045680bb3d59973.tar.bz2 pyramid-6279cc428b2464066f67e4795045680bb3d59973.zip | |
Merge branch 'master' into fix.shared-view-renderer
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 319d41434..4f9bd6e41 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -242,3 +242,5 @@ Contributors - Ilja Everila, 2015/02/05 - Geoffrey T. Dairiki, 2015/02/06 + +- David Glick, 2015/02/12 |