diff options
| author | Chris McDonough <chrism@plope.com> | 2012-04-17 04:59:48 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-04-17 04:59:48 -0400 |
| commit | c8aab32b60706f700b7f6a70d967727c353e3d54 (patch) | |
| tree | c7db8d4401e8a0dc8dc023679eb826d47b958f15 /docs/api | |
| parent | 04e71690aaa32cb75af1095654d3f7e89946dab3 (diff) | |
| parent | 18410a6d9d64786f272268db6368981955ff9f10 (diff) | |
| download | pyramid-c8aab32b60706f700b7f6a70d967727c353e3d54.tar.gz pyramid-c8aab32b60706f700b7f6a70d967727c353e3d54.tar.bz2 pyramid-c8aab32b60706f700b7f6a70d967727c353e3d54.zip | |
Merge branch 'mmerickel-feature.json-api'
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/renderers.rst | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/docs/api/renderers.rst b/docs/api/renderers.rst index ab182365e..ea000ad02 100644 --- a/docs/api/renderers.rst +++ b/docs/api/renderers.rst @@ -15,8 +15,6 @@ .. autoclass:: JSONP -.. autoclass:: ObjectJSONEncoder - .. attribute:: null_renderer An object that can be used in advanced integration cases as input to the |