summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-10-01 10:49:37 -0400
committerChris McDonough <chrism@plope.com>2013-10-01 10:49:37 -0400
commit5f3405096173450e43152c2d7172cca97512ac4e (patch)
tree0f6b27ad2f0244d488454c572b869a3501d2acda /docs/conf.py
parentd65b1597ddbdfb161a0c83c46b5ebad878571c76 (diff)
parent1a76ed41b133ea73c7d40997c6f564fd72d7273e (diff)
downloadpyramid-5f3405096173450e43152c2d7172cca97512ac4e.tar.gz
pyramid-5f3405096173450e43152c2d7172cca97512ac4e.tar.bz2
pyramid-5f3405096173450e43152c2d7172cca97512ac4e.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py
index a7a4a441a..ee852aa51 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -92,6 +92,7 @@ intersphinx_mapping = {
None),
}
+
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']