summaryrefslogtreecommitdiff
path: root/docs/copyright.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-17 14:09:45 -0500
committerChris McDonough <chrism@plope.com>2010-11-17 14:09:45 -0500
commit2454ccec90fbbe7f1e35d2ea4c2d67ef1fe41759 (patch)
treeaf34fba5b6b02c455afa92895c5e14bd4a0eeff2 /docs/copyright.rst
parent42ec1ec1de4e1ce6b70af1d5e520493d9d7ec91a (diff)
parent54cf7cb2572f43bc70cfb9f7c156095de68d41e6 (diff)
downloadpyramid-2454ccec90fbbe7f1e35d2ea4c2d67ef1fe41759.tar.gz
pyramid-2454ccec90fbbe7f1e35d2ea4c2d67ef1fe41759.tar.bz2
pyramid-2454ccec90fbbe7f1e35d2ea4c2d67ef1fe41759.zip
Merge branch 'mgedmin-master'
Diffstat (limited to 'docs/copyright.rst')
0 files changed, 0 insertions, 0 deletions