summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2022-12-29 16:45:48 -0600
committerGitHub <noreply@github.com>2022-12-29 16:45:48 -0600
commitdc4e2e282d60a8387e60ac5fd2b1813b9df3535d (patch)
tree8664fdc6dd332dd55c2a0fb11970c856fb900bd4 /CONTRIBUTORS.txt
parent13df6badcf97ad379dc88bb9773bdabc1520a71d (diff)
parent4703e60eb7ddb870bf2cc69eaafd8e12fa966636 (diff)
downloadpyramid-dc4e2e282d60a8387e60ac5fd2b1813b9df3535d.tar.gz
pyramid-dc4e2e282d60a8387e60ac5fd2b1813b9df3535d.tar.bz2
pyramid-dc4e2e282d60a8387e60ac5fd2b1813b9df3535d.zip
Merge branch 'master' into main
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index edce6e9c7..a2dc79e9d 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -358,3 +358,5 @@ Contributors
- Jens Troeger, 2021/04/08
- Karthikeyan Singaravelan, 2021/08/24
+
+- Camill Kaipf, 2022/08/12