summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-08-31 23:40:39 -0500
committerMichael Merickel <michael@merickel.org>2016-08-31 23:40:39 -0500
commitf9a5c5ba01066dfc81805def6aac8dab9dde2d67 (patch)
tree8c25b01203992222b7fe0989cf45d641dd4bd99c /CONTRIBUTORS.txt
parentdd0a1589a3d6cbf4557ba4987fae48b715bf1714 (diff)
parent693cb098a7bc8fbff5fb97c1ac031d0b6e397060 (diff)
downloadpyramid-f9a5c5ba01066dfc81805def6aac8dab9dde2d67.tar.gz
pyramid-f9a5c5ba01066dfc81805def6aac8dab9dde2d67.tar.bz2
pyramid-f9a5c5ba01066dfc81805def6aac8dab9dde2d67.zip
Merge branch 'extract_http_basic' of canni/pyramid into canni-extract_http_basic
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 12b6fedcf..bb21337e2 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -279,6 +279,8 @@ Contributors
- Jean-Christophe Bohin, 2016/06/13
+- Dariusz Gorecki, 2016/07/15
+
- Jon Davidson, 2016/07/18
- Keith Yang, 2016/07/22