summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2022-12-30 11:08:44 -0600
committerGitHub <noreply@github.com>2022-12-30 11:08:44 -0600
commit93a69202dc225dc5ae659824751f59c2d33f6373 (patch)
treef7c7b75cedfbfa3bb17257abd55d2eeaae8facec /CONTRIBUTORS.txt
parent7ecd8d6f75d9d21f3f7b10e4c84958cf3aa8fb17 (diff)
parent4703e60eb7ddb870bf2cc69eaafd8e12fa966636 (diff)
downloadpyramid-93a69202dc225dc5ae659824751f59c2d33f6373.tar.gz
pyramid-93a69202dc225dc5ae659824751f59c2d33f6373.tar.bz2
pyramid-93a69202dc225dc5ae659824751f59c2d33f6373.zip
Merge branch 'master' into py311
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 92ecd67de..9b7f3819f 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -359,4 +359,6 @@ Contributors
- Karthikeyan Singaravelan, 2021/08/24
-- Stefano Rivera, 2022/12/29
+- Camill Kaipf, 2022/08/12
+
+- Stefano Rivera, 2022/12/29 \ No newline at end of file