summaryrefslogtreecommitdiff
path: root/docs/index.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-29 13:57:54 -0500
committerChris McDonough <chrism@plope.com>2010-12-29 13:57:54 -0500
commit7f14c3750dcf2b79e9146b0a3750af307fd1a86b (patch)
tree198d67733a6303f3ce0c8f17e3938d0619f37ed2 /docs/index.rst
parentfcfc5aebc259fa34d8d2313adde7c2f57bab2e53 (diff)
parent581a401c26047a6cddb6521393de4030ce0a962a (diff)
downloadpyramid-7f14c3750dcf2b79e9146b0a3750af307fd1a86b.tar.gz
pyramid-7f14c3750dcf2b79e9146b0a3750af307fd1a86b.tar.bz2
pyramid-7f14c3750dcf2b79e9146b0a3750af307fd1a86b.zip
Merge branch 'master' into viewderiver
Diffstat (limited to 'docs/index.rst')
-rw-r--r--docs/index.rst1
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 23ffb3b1b..d35eb2325 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -78,7 +78,6 @@ applications to various platforms.
tutorials/wiki/index.rst
tutorials/wiki2/index.rst
tutorials/bfg/index.rst
- tutorials/cmf/index.rst
tutorials/gae/index.rst
tutorials/modwsgi/index.rst
tutorials/zeo/index.rst