diff options
| author | Theron Luhn <theron@luhn.com> | 2019-03-30 15:02:43 -0700 |
|---|---|---|
| committer | Theron Luhn <theron@luhn.com> | 2019-03-30 15:02:43 -0700 |
| commit | b05b66e77b9851ff2ed912b6b8bfa0d5068febd1 (patch) | |
| tree | d2cb66fc602f430522c6459923e88a303086f513 /CONTRIBUTORS.txt | |
| parent | 9f267dd842c5e93336f0392f2809da75a716039a (diff) | |
| parent | 01618a1399f547fb1f89cf8b56600325b4f8d04b (diff) | |
| download | pyramid-b05b66e77b9851ff2ed912b6b8bfa0d5068febd1.tar.gz pyramid-b05b66e77b9851ff2ed912b6b8bfa0d5068febd1.tar.bz2 pyramid-b05b66e77b9851ff2ed912b6b8bfa0d5068febd1.zip | |
Merge branch 'master' into security-policy
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 019c66c9a..33218cbbd 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -337,6 +337,8 @@ Contributors - Alexandre Yukio Harano, 2018/10/05 +- Eric Atkin, 2019/02/15 + - Arijit Basu, 2019/02/19 -- Theron Luhn, 2019/03/30
\ No newline at end of file +- Theron Luhn, 2019/03/30 |