summaryrefslogtreecommitdiff
path: root/docs/api.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-10-08 17:34:43 -0400
committerChris McDonough <chrism@plope.com>2012-10-08 17:34:43 -0400
commit2aed2c783a99efaa48b145d174347c9512e40c5a (patch)
tree11ab8f12072353e7e324e66bda5914c78cd5c1ea /docs/api.rst
parenta9f5e705bb331098946eef774857511a02e4f498 (diff)
parent1273d56ee5c038f447dce0525844cd3ea6c15e4d (diff)
downloadpyramid-2aed2c783a99efaa48b145d174347c9512e40c5a.tar.gz
pyramid-2aed2c783a99efaa48b145d174347c9512e40c5a.tar.bz2
pyramid-2aed2c783a99efaa48b145d174347c9512e40c5a.zip
Merge branch 'master' of github.com:Pylons/pyramid
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 e33fd6a74..9e540b49b 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -12,6 +12,7 @@ documentation is organized alphabetically by module name.
api/authentication
api/compat
api/config
+ api/decorator
api/events
api/exceptions
api/httpexceptions