summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-04-08 17:07:28 -0400
committerChris McDonough <chrism@plope.com>2012-04-08 17:07:28 -0400
commit5ceefa60dc548d95f5a96a2a149c3ad52bedf87c (patch)
tree82299bed8dd3a404474ef8d07aaaf670e05870b4 /docs/conf.py
parentd806f9babf869d1eaf0ec19fb6d0b3a14c5ae92d (diff)
parent35870f66ea9ea0a7264175cf2e434d2193a7c22c (diff)
downloadpyramid-5ceefa60dc548d95f5a96a2a149c3ad52bedf87c.tar.gz
pyramid-5ceefa60dc548d95f5a96a2a149c3ad52bedf87c.tar.bz2
pyramid-5ceefa60dc548d95f5a96a2a149c3ad52bedf87c.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions