summaryrefslogtreecommitdiff
path: root/docs/_static
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-09-09 13:12:39 -0400
committerChris McDonough <chrism@plope.com>2012-09-09 13:12:39 -0400
commit05938c540918fd2e24db69851a7c1cec7ad6630f (patch)
tree7219dc272800ae0d9b009c36fec8cb31c69f4288 /docs/_static
parent25d3ddfd61bcc97ad6e2d5d9c51a71719f18af57 (diff)
parentf6bd88ecb34b26315b01650dfa586ea8b59dc746 (diff)
downloadpyramid-05938c540918fd2e24db69851a7c1cec7ad6630f.tar.gz
pyramid-05938c540918fd2e24db69851a7c1cec7ad6630f.tar.bz2
pyramid-05938c540918fd2e24db69851a7c1cec7ad6630f.zip
Merge branch 'master' into feature.14removedeprecations
Diffstat (limited to 'docs/_static')
0 files changed, 0 insertions, 0 deletions