summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2018-06-05 18:52:12 -0600
committerBert JW Regeer <bertjw@regeer.org>2018-06-05 18:52:12 -0600
commit0a998e40bd33d859aa2494fc06d28f138fca3c58 (patch)
treec8e9044b05c542102d10ac4198e35db9293ac205 /CONTRIBUTORS.txt
parent967a06c2f5fe3d510dc825ec7b5ecd3934f93bad (diff)
parent2c5e19954f252cbdb30842140d45df33b1dbe62b (diff)
downloadpyramid-0a998e40bd33d859aa2494fc06d28f138fca3c58.tar.gz
pyramid-0a998e40bd33d859aa2494fc06d28f138fca3c58.tar.bz2
pyramid-0a998e40bd33d859aa2494fc06d28f138fca3c58.zip
Merge PR #3298 of Pylons/pyramid into feature/session-samesite-lax
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 60e4e5732..69ed023b0 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -319,4 +319,6 @@ Contributors
- Hunter Senft-Grupp, 2018/05/14
-- Junhak Lee, 2018/05/14 \ No newline at end of file
+- Junhak Lee, 2018/05/14
+
+- Alex Gaynor, 2018/05/24