diff options
| author | Chris McDonough <chrism@plope.com> | 2013-11-18 07:03:51 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-11-18 07:03:51 -0500 |
| commit | c503891d43251e7bf6111c6c1f521b43c55d917b (patch) | |
| tree | 3028630a1d1e331718e16be26a54d69c56d76b9d /docs/narr/views.rst | |
| parent | 345694c8eb6dff9ef7375374c5032e53b764c1de (diff) | |
| parent | fb15c26a2960d5f7bf598c147f1dd6ad6a062952 (diff) | |
| download | pyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.tar.gz pyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.tar.bz2 pyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.zip | |
Merge branch 'master' into 1.5-branch
Diffstat (limited to 'docs/narr/views.rst')
| -rw-r--r-- | docs/narr/views.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/views.rst b/docs/narr/views.rst index b2dd549ce..a746eb043 100644 --- a/docs/narr/views.rst +++ b/docs/narr/views.rst @@ -536,7 +536,7 @@ The following types work as view callables in this style: e.g.: .. code-block:: python - :linenos: + :linenos: from pyramid.response import Response |