diff options
| author | Michael Merickel <michael@merickel.org> | 2018-09-27 01:24:33 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-09-27 01:24:33 -0500 |
| commit | f4404b11a89f9d32652702190506984a594d8393 (patch) | |
| tree | 67a7b7b22726d89be68383d27da80c3ef4a72cb2 /CONTRIBUTORS.txt | |
| parent | 97ee7f3aa8af74a01e51c0c14fda1c0a5a490663 (diff) | |
| parent | 4eade6a2fa6111673231b02344afdc562fe7f05d (diff) | |
| download | pyramid-f4404b11a89f9d32652702190506984a594d8393.tar.gz pyramid-f4404b11a89f9d32652702190506984a594d8393.tar.bz2 pyramid-f4404b11a89f9d32652702190506984a594d8393.zip | |
Merge branch 'master' into deprecate-pickle-sessions
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 0c18d600f..80b43c8ec 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -331,3 +331,4 @@ Contributors - Kuzma Leshakov, 2018/09/07 +- Colin Dunklau, 2018/09/19 |