summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-07-17 03:40:29 -0400
committerChris McDonough <chrism@plope.com>2013-07-17 03:40:29 -0400
commitf57d764b2a53c52dcd5518f86beca99eb4690ecd (patch)
treecdcaea33aae06bcbce8cba5ffa35d34f3f4f60fd /docs/conf.py
parentdf3cd8dd94d8529e211d3319bb10a3ced1b3990b (diff)
parente60fcf5d6912d8f3788f2ac1c0bc0ac1f646b62d (diff)
downloadpyramid-f57d764b2a53c52dcd5518f86beca99eb4690ecd.tar.gz
pyramid-f57d764b2a53c52dcd5518f86beca99eb4690ecd.tar.bz2
pyramid-f57d764b2a53c52dcd5518f86beca99eb4690ecd.zip
Merge branch 'wichert-auth-parent-domain'
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions