summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorDariusz Górecki <darek.krk@gmail.com>2016-07-18 18:15:28 +0100
committerDariusz Górecki <darek.krk@gmail.com>2016-07-18 18:15:28 +0100
commitc0ddbc37530042119539b60245e2e2a4fccc83c0 (patch)
tree8866675dad4897447e2a1e88d459c94c00ef21c3 /CONTRIBUTORS.txt
parentd54e0ae42b0289df89b5b73722d5c11d0f13a8ba (diff)
parent81171c86a1d217ac38198b4d986b6e87837b035e (diff)
downloadpyramid-c0ddbc37530042119539b60245e2e2a4fccc83c0.tar.gz
pyramid-c0ddbc37530042119539b60245e2e2a4fccc83c0.tar.bz2
pyramid-c0ddbc37530042119539b60245e2e2a4fccc83c0.zip
Merge remote-tracking branch 'upstream/master' into extract_http_basic
Diffstat (limited to 'CONTRIBUTORS.txt')
0 files changed, 0 insertions, 0 deletions