summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorTheron Luhn <theron@luhn.com>2019-03-30 10:56:25 -0700
committerTheron Luhn <theron@luhn.com>2019-03-30 10:56:25 -0700
commit05b24d434e108f6a8490e8c2520e120e4a831534 (patch)
tree0e9d9b93418e4292da3f5a54f9443b2a64094a42 /CONTRIBUTORS.txt
parent6aba89d19cc384021864d3b83d53082f56c3f419 (diff)
parent80baff6e61d775dc34bb11b7d6c8ef8569da1c40 (diff)
downloadpyramid-05b24d434e108f6a8490e8c2520e120e4a831534.tar.gz
pyramid-05b24d434e108f6a8490e8c2520e120e4a831534.tar.bz2
pyramid-05b24d434e108f6a8490e8c2520e120e4a831534.zip
Merge branch 'master' into security-policy
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 42a1f8cc2..019c66c9a 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -337,4 +337,6 @@ Contributors
- Alexandre Yukio Harano, 2018/10/05
-- Theron Luhn, 2019/02/17
+- Arijit Basu, 2019/02/19
+
+- Theron Luhn, 2019/03/30 \ No newline at end of file