summaryrefslogtreecommitdiff
path: root/docs/api.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-06 20:35:44 -0400
committerChris McDonough <chrism@plope.com>2011-08-06 20:35:44 -0400
commit6c3f78b0a5563a642b98f7a0eb01d1854c45e6b0 (patch)
tree57c0fb799ed585a8c2c5af609a297fdeccc62d8f /docs/api.rst
parent37699448a389c2712f262c574e5115aaab27adda (diff)
parent18a99ae15e7f36cd21da6e2d2e70d61d1733bf30 (diff)
downloadpyramid-6c3f78b0a5563a642b98f7a0eb01d1854c45e6b0.tar.gz
pyramid-6c3f78b0a5563a642b98f7a0eb01d1854c45e6b0.tar.bz2
pyramid-6c3f78b0a5563a642b98f7a0eb01d1854c45e6b0.zip
Merge branch 'handlerchanges'
Diffstat (limited to 'docs/api.rst')
-rw-r--r--docs/api.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/api.rst b/docs/api.rst
index a7e1566d3..6ff6e9fb1 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -32,6 +32,7 @@ documentation is organized alphabetically by module name.
api/testing
api/threadlocal
api/traversal
+ api/tweens
api/url
api/view
api/wsgi