summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2015-06-06 15:02:58 -0700
committerSteve Piercy <web@stevepiercy.com>2015-06-06 15:02:58 -0700
commita4b674f0bddc5104b8d8b0e179f71ecd5e10336f (patch)
tree0f05e679f73bfb16afae03fdd1bff32a8b6d3692 /CONTRIBUTORS.txt
parent2881d6f956a846e3d42fafbc21aec07c37346588 (diff)
parentf866fa68ffcac3e200e4d530f8c157e5848e60b0 (diff)
downloadpyramid-a4b674f0bddc5104b8d8b0e179f71ecd5e10336f.tar.gz
pyramid-a4b674f0bddc5104b8d8b0e179f71ecd5e10336f.tar.bz2
pyramid-a4b674f0bddc5104b8d8b0e179f71ecd5e10336f.zip
Merge pull request #1831 from stevepiercy/master
cherry pick 1.6-branch to master
Diffstat (limited to 'CONTRIBUTORS.txt')
0 files changed, 0 insertions, 0 deletions